diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-06-13 13:04:56 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-06-19 20:00:39 +0200 |
| commit | e56a8300d36a7998e492e87bc514d14d931cf01d (patch) | |
| tree | 2c2b24a29854166103f5d6300b1a75d0e019973f /solenv/gbuild/platform | |
| parent | d8ddd3f1c9faa3338703217967bae5c363df0e45 (diff) | |
use gb_StaticLibrary_WORKDIR and gb_Library_DLLDIR more consistently
same for gb_Executable_BINDIR[_FOR_BUILD] and fold
gb_Library_WORKDIR_FOR_BUILD into gb_Library_DLLDIR_FOR_BUILD (the
latter also has a workdir variant)
Change-Id: If7e4cf9aab46728182c89344546065bc33b452b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169201
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/platform/iOS.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index d34464030d5e..6c81efcc6e35 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -222,7 +222,7 @@ gb_StaticLibrary_PLAINEXT := .a gb_StaticLibrary_StaticLibrary_platform := gb_LinkTarget_get_linksearchpath_for_layer = \ - -L$(WORKDIR)/LinkTarget/StaticLibrary \ + -L$(gb_StaticLibrary_WORKDIR) \ -L$(call gb_Library_get_sdk_link_dir) \ $(foreach layer,\ $(subst +, ,$(patsubst $(1):%.,%,\ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 6c1015e9b533..b1a825a54dd2 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -237,11 +237,11 @@ gb_LinkTarget_get_manifestfile = \ $(WORKDIR)/LinkTarget/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)).manifest gb_LinkTarget_get_linksearchpath_for_layer = \ - -LIBPATH:$(WORKDIR)/LinkTarget/StaticLibrary \ + -LIBPATH:$(gb_StaticLibrary_WORKDIR) \ -LIBPATH:$(INSTDIR)/$(SDKDIRNAME)/lib \ $(if $(filter OXT,$(1)),\ -LIBPATH:$(WORKDIR)/LinkTarget/ExtensionLibrary, \ - -LIBPATH:$(WORKDIR)/LinkTarget/Library) + -LIBPATH:$(gb_Library_DLLDIR)) # avoid fatal error LNK1170 for Library_merged define gb_LinkTarget_MergedResponseFile @@ -607,8 +607,7 @@ $(eval $(call gb_Helper_make_dep_targets,\ )) ifeq ($(gb_FULLDEPS),$(true)) -# FIXME this is used before TargetLocations is read? -gb_WinResTarget__command_target = $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/makedepend.exe +gb_WinResTarget__command_target := $(gb_Executable_BINDIR_FOR_BUILD)/makedepend.exe define gb_WinResTarget__command_dep $(call gb_Output_announce,RC:$(2),$(true),DEP,1) $(call gb_Trace_StartRange,RC:$(2),DEP) diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk index 9c5d20103d3c..c7dae1f7d177 100644 --- a/solenv/gbuild/platform/iOS.mk +++ b/solenv/gbuild/platform/iOS.mk @@ -183,7 +183,7 @@ endef gb_Library__set_soversion_script_platform = -gb_Library_get_sdk_link_dir = $(WORKDIR)/LinkTarget/Library +gb_Library_get_sdk_link_dir := $(gb_Library_DLLDIR) # Executable class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 90bd987f9e4e..7155fd03ba13 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -227,7 +227,7 @@ 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_dir := $(gb_Library_DLLDIR) gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) |