diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-17 14:30:51 +0200 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-06-20 06:49:12 +0200 |
commit | 76b037180cba4e0c275560a7f7829bc820eb6ad6 (patch) | |
tree | 5a055197739b7ba314b43adf5412fe781ad70fe2 /solenv | |
parent | 1e5933f0e60ca44e908a4aab81fd8802f234b081 (diff) |
Make spsupp_x64 independent of shell/CustomTarget_x64
... in preparation for further changes.
Thanks to Noel Grandin for the hint!
Change-Id: I2b223322d1d42099b56a74a92e3c39631d6b581c
Reviewed-on: https://gerrit.libreoffice.org/72470
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/72501
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit d35eec7b26c7807092b78144b6c71639b9439612)
Reviewed-on: https://gerrit.libreoffice.org/74406
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index bc6d3610daf6..b4e9195ad991 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1405,7 +1405,6 @@ endef # call gb_LinkTarget_add_x64_generated_cobjects,linktarget,sourcefiles,cflags,linktargetmakefilename define gb_LinkTarget_add_x64_generated_cobjects $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3),$(4))) -$(foreach obj,$(2),$(eval $(call gb_GenCObject_get_target,$(obj)) : CXXOBJECT_X64 := YES)) endef # call gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,linktargetmakefilename,cxxflags diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 1fefa80fef61..5e6791d295a8 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -39,7 +39,7 @@ define gb_CObject__command_pattern $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ unset INCLUDE && \ - $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), \ + $(if $(filter YES,$(LIBRARY_X64)), $(CXX_X64_BINARY), \ $(if $(filter %.c,$(3)), $(gb_CC), \ $(if $(filter -clr,$(2)), \ $(MSVC_CXX) -I$(SRCDIR)/solenv/clang-cl,$(gb_CXX)))) \ @@ -56,7 +56,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(PCHFLAGS) \ $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \ $(INCLUDE) \ - $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ + $(if $(filter YES,$(LIBRARY_X64)), -U_X86_ -D_AMD64_,) \ -c $(3) \ -Fo$(1)) $(if $(filter $(true),$(gb_SYMBOL)),/link /DEBUG:FASTLINK) \ $(if $(COMPILER_TEST),,$(call gb_create_deps,$(4),$(1),$(3))) |