Kaydet (Commit) b84e197e authored tarafından Michael Stahl's avatar Michael Stahl

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).
üst 7d7b41cf
...@@ -147,6 +147,7 @@ gb_LinkTarget_LDFLAGS += \ ...@@ -147,6 +147,7 @@ gb_LinkTarget_LDFLAGS += \
endif endif
#JAD# -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ #JAD# -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
gb_LinkTarget_LDFLAGS += \ gb_LinkTarget_LDFLAGS += \
-L$(SYSBASE)/lib \ -L$(SYSBASE)/lib \
-L$(SYSBASE)/usr/lib \ -L$(SYSBASE)/usr/lib \
...@@ -301,9 +302,9 @@ gb_Library_LAYER := \ ...@@ -301,9 +302,9 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ $(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)' #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
define gb_Library__get_rpath
$(if $(1),$(strip '-Wl,-rpath,$(1)'))
endef endef
define gb_Library_get_rpath define gb_Library_get_rpath
...@@ -363,7 +364,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) ...@@ -363,7 +364,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
define gb_CppunitTest_CppunitTest_platform define gb_CppunitTest_CppunitTest_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := -L$(gb_Library_OUTDIRLOCATION) $(call gb_LinkTarget_get_target,$(2)) : RPATH :=
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment