diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-10 18:42:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-10 18:45:35 +0200 |
| commit | b84e197e696e2d29616abde0f5e84484eef2ddc8 (patch) | |
| tree | 9cf7653e3ee1faf16ff2a875961adb84d4de1aa2 /solenv | |
| parent | 7d7b41cf12a7026ea583e34dbb31196a884db65b (diff) | |
gbuild: Solaris: fix gb_LinkTarget_LDFLAGS:
This was accidentally commented out, and thus SOLARLIB was not in
effect; fixing this should obviate the need for any
-L$(gb_Library_OUTDIRLOCATION).
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 523be8336931..054398c4010c 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -147,6 +147,7 @@ gb_LinkTarget_LDFLAGS += \ endif #JAD# -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ + gb_LinkTarget_LDFLAGS += \ -L$(SYSBASE)/lib \ -L$(SYSBASE)/usr/lib \ @@ -301,9 +302,9 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ -define gb_Library__get_rpath -$(if $(1),$(strip '-Wl,-rpath,$(1)' -L$(gb_Library_OUTDIRLOCATION))) #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' +define gb_Library__get_rpath +$(if $(1),$(strip '-Wl,-rpath,$(1)')) endef define gb_Library_get_rpath @@ -363,7 +364,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) define gb_CppunitTest_CppunitTest_platform -$(call gb_LinkTarget_get_target,$(2)) : RPATH := -L$(gb_Library_OUTDIRLOCATION) +$(call gb_LinkTarget_get_target,$(2)) : RPATH := endef |