diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 13:06:25 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 13:07:51 +0100 |
| commit | 07a31ccc02f3553f1be3e8bb5ff67e6e6f7ce016 (patch) | |
| tree | 9021529fac6b397aa7b1cb098d5d8c99e96cf04f /external | |
| parent | ce85ba3e2e926f72084cef2f18343f5f09f03152 (diff) | |
curl: set the right RPATH too
Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 23dce1170044..142a782efcc9 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\ ifneq ($(OS),WNT) curl_CPPFLAGS := -curl_LDFLAGS := +curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) ifneq ($(SYSBASE),) curl_CPPFLAGS += -I$(SYSBASE)/usr/include @@ -36,7 +36,7 @@ endif $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ CPPFLAGS="$(curl_CPPFLAGS)" \ - LDFLAGS="$(curl_LDFLAGS)" \ + LDFLAGS=$(curl_LDFLAGS) \ ./configure \ --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out") \ --without-ssl \ |