Kaydet (Commit) 47e395ca authored tarafından Stephan Bergmann's avatar Stephan Bergmann

On Mac, the lib/libuno_*.dylib symlinks are not in the SDK

...but rather dynamically created (via the SDK's setsdkenv_unix.sh.in) in the
SDK's per-user output tree.  So better reflect that in instdir by putting the
symlinks into workdir/LinkTarget/Library/ instead on Mac.  (Which has the
additional benefit that the location of the symlinks doesn't change with the
versioned SDKDIRNAME.)

Change-Id: I77237f6a5d64771c3cb0866e125925ed7b0ecdaf
üst 9303192c
...@@ -45,7 +45,7 @@ $(WORKDIR)/Clean/Library/% : ...@@ -45,7 +45,7 @@ $(WORKDIR)/Clean/Library/% :
gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS))) 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_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 define gb_Library_Library
$(call gb_Postprocess_register_target,AllLibraries,Library,$(1)) $(call gb_Postprocess_register_target,AllLibraries,Library,$(1))
......
...@@ -209,7 +209,7 @@ $(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).export ...@@ -209,7 +209,7 @@ $(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).export
endef endef
define gb_Library_get_versionlink_target 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 endef
define gb_Library_get_headers_target define gb_Library_get_headers_target
......
...@@ -197,7 +197,7 @@ gb_StaticLibrary_StaticLibrary_platform := ...@@ -197,7 +197,7 @@ gb_StaticLibrary_StaticLibrary_platform :=
gb_LinkTarget_get_linksearchpath_for_layer = \ gb_LinkTarget_get_linksearchpath_for_layer = \
-L$(WORKDIR)/LinkTarget/StaticLibrary \ -L$(WORKDIR)/LinkTarget/StaticLibrary \
-L$(INSTDIR)/$(SDKDIRNAME)/lib \ -L$(call gb_Library_get_sdk_link_dir) \
$(foreach layer,\ $(foreach layer,\
$(subst +, ,$(patsubst $(1):%.,%,\ $(subst +, ,$(patsubst $(1):%.,%,\
$(filter $(1):%.,$(gb_LinkTarget_LAYER_LINKPATHS)))),\ $(filter $(1):%.,$(gb_LinkTarget_LAYER_LINKPATHS)))),\
......
...@@ -319,6 +319,8 @@ define gb_Library_get_ilibfilename ...@@ -319,6 +319,8 @@ define gb_Library_get_ilibfilename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES)))
endef endef
gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib
gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target)
# StaticLibrary class # StaticLibrary class
......
...@@ -220,6 +220,8 @@ endef ...@@ -220,6 +220,8 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) 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) gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target)
# bundle is a special kind of library that exists only on Darwin/OSX # bundle is a special kind of library that exists only on Darwin/OSX
......
...@@ -256,6 +256,8 @@ define gb_Library_get_ilibfilename ...@@ -256,6 +256,8 @@ define gb_Library_get_ilibfilename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES)))
endef endef
gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib
gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target)
# Executable class # Executable class
......
...@@ -229,6 +229,8 @@ endef ...@@ -229,6 +229,8 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) 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) gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target)
# Executable class # Executable class
......
...@@ -223,6 +223,8 @@ endef ...@@ -223,6 +223,8 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) 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) gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target)
# Executable class # Executable class
......
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