]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
make: add -rpath only on non-Darwin POSIX
authorVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 1 Aug 2017 11:47:10 +0000 (13:47 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 1 Aug 2017 14:33:21 +0000 (16:33 +0200)
I didn't recall this doesn't work on Darwin.

config.mk
platform.mk

index c1bd74d99ab73f624b042ebd44ba34b792eee33a..e7db4577a7cee0002723d2dd10dabf008efdc92b 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -28,7 +28,7 @@ XXD_LUA := ./scripts/embed-lua.sh
 INSTALL := install
 
 # Flags
-BUILD_LDFLAGS += "-Wl,-rpath=$(LIBDIR)" $(LDFLAGS)
+BUILD_LDFLAGS += $(LDFLAGS)
 BUILD_CFLAGS := $(CFLAGS) -std=c99 -D_GNU_SOURCE -Wno-unused -Wtype-limits -Wformat -Wformat-security -Wall -I$(abspath .) -I$(abspath lib/generic) -I$(abspath contrib) -I$(abspath contrib/lmdb)
 BUILD_CFLAGS += -DPACKAGE_VERSION="\"$(VERSION)\"" -DPREFIX="\"$(PREFIX)\"" -DMODULEDIR="\"$(MODULEDIR)\""
 ifeq (,$(findstring -O,$(CFLAGS)))
index ad3367c18303fb6c95ce929bfb0f93ef8fc8c8cc..b56be022661b04e2f5113df59498d7885b70199e 100644 (file)
@@ -43,7 +43,7 @@ else
                SOVER = $(if $(1), -compatibility_version $(2) -current_version $(1),)
        else
                PLATFORM := POSIX
-               LDFLAGS += -pthread -lm -Wl,-E
+               LDFLAGS += -pthread -lm -Wl,-E "-Wl,-rpath=$(LIBDIR)"
                 # ELF hardening options
                ifneq ($(HARDENING),no)
                        BINFLAGS += -pie