diff options
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/mingw.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
8 files changed, 13 insertions, 3 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 6bc20f7c5ca5..17135e5dcfd9 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -45,7 +45,7 @@ $(WORKDIR)/Clean/Library/% : gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS))) gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1))) -gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) +gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(call gb_Library_get_sdk_link_dir)/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) define gb_Library_Library $(call gb_Postprocess_register_target,AllLibraries,Library,$(1)) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index a36e629c6ff7..8a7c9adf9d72 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -209,7 +209,7 @@ $(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).export endef define gb_Library_get_versionlink_target -$(INSTDIR)/$(SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1))) +$(call gb_Library_get_sdk_link_dir)/$(basename $(call gb_Library_get_filename,$(1))) endef define gb_Library_get_headers_target diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index e2e4a2a3a4e5..c7bf4b7bf668 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -197,7 +197,7 @@ gb_StaticLibrary_StaticLibrary_platform := gb_LinkTarget_get_linksearchpath_for_layer = \ -L$(WORKDIR)/LinkTarget/StaticLibrary \ - -L$(INSTDIR)/$(SDKDIRNAME)/lib \ + -L$(call gb_Library_get_sdk_link_dir) \ $(foreach layer,\ $(subst +, ,$(patsubst $(1):%.,%,\ $(filter $(1):%.,$(gb_LinkTarget_LAYER_LINKPATHS)))),\ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index b4dc1e32c5a3..1ebd72e2e129 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -319,6 +319,8 @@ define gb_Library_get_ilibfilename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) endef +gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib + gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) # StaticLibrary class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 185fb260bc46..4aa813f88ffe 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -220,6 +220,8 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Library_get_sdk_link_dir = $(WORKDIR)/LinkTarget/Library + gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) # bundle is a special kind of library that exists only on Darwin/OSX diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index f60c1fc7c91e..ea53a571d8ea 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -256,6 +256,8 @@ define gb_Library_get_ilibfilename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) endef +gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib + gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) # Executable class diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index c2147d4f8733..0f0ff13808c5 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -229,6 +229,8 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib + gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) # Executable class diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 778590baa7a3..562d535ce61a 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -223,6 +223,8 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib + gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) # Executable class |