Skip to content

Commit d69cda3

Browse files
committed
Do not include rpath in release builds
That is (rightly) forbidden in openSUSE, but also a bad idea on other distros too. QubesOS/qubes-issues#6567
1 parent 286cbfa commit d69cda3

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

qubes-rpc/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ LDLIBS := -lqubes-rpc-filecopy -lqubes-pure
1919

2020
all: vm-file-editor qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check bin-qfile-unpacker
2121

22+
ifdef DEVEL_BUILD
2223
# Ensure that these programs can find their shared libraries,
2324
# even when installed in e.g. a TemplateBasedVM to somewhere other
2425
# than /usr.
2526
vm-file-editor qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check: LDFLAGS += '-Wl,-rpath,$$ORIGIN/../../$$LIB'
2627
# This is installed in /usr/bin, not /usr/lib/qubes, so it needs a different rpath.
2728
bin-qfile-unpacker: LDFLAGS += '-Wl,-rpath,$$ORIGIN/../$$LIB'
29+
endif
30+
2831
bin-qfile-unpacker: qfile-unpacker.o gui-fatal.o
2932
$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
3033
qubes-fs-tree-check: LDLIBS := -lqubes-pure

0 commit comments

Comments
 (0)