diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-04-07 12:06:19 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-04-11 12:21:08 +0200 |
| commit | 3d3826dae92a8bd4671717d92f497db57f6424d1 (patch) | |
| tree | d5d1e62cd4ca1db34f340f92fb3613edb007db6d /solenv/gbuild/platform/com_GCC_class.mk | |
| parent | eeeec33ada5923f1f534334b22c15d6e2c6f1d35 (diff) | |
fix getting correct debug/nodebug PCH file with selective debuginfo
Since debuginfo enabled/disabled is per-linktarget, the rules need
to be per-linktarget as well, and so instead of one generic rule
there needs to be a define generating one rule per each linktarget.
Change-Id: I9423c4a86bc02aa3c0bf816f47e3c3d43ff03b23
Reviewed-on: https://gerrit.libreoffice.org/70370
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv/gbuild/platform/com_GCC_class.mk')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index a5059152a0cb..282aacbfd9ec 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -79,10 +79,10 @@ endef # PrecompiledHeader class ifeq ($(COM_IS_CLANG),TRUE) -gb_PrecompiledHeader_get_enableflags = -include-pch $(call gb_PrecompiledHeader_get_target,$(1)) +gb_PrecompiledHeader_get_enableflags = -include-pch $(call gb_PrecompiledHeader_get_target,$(1),$(2)) else -gb_PrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call gb_PrecompiledHeader_get_target,$(1)))) \ - -I $(dir $(call gb_PrecompiledHeader_get_target,$(1))) +gb_PrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call gb_PrecompiledHeader_get_target,$(1),$(2)))) \ + -I $(dir $(call gb_PrecompiledHeader_get_target,$(1),$(2))) endif # Clang and gcc do not need any extra .o file for PCH @@ -91,7 +91,7 @@ gb_PrecompiledHeader_get_objectfile = define gb_PrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \ $(gb_CXX) \ -x c++-header \ $(4) $(5) \ @@ -99,10 +99,10 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \ $(6) \ - $(call gb_cxx_dep_generation_options,$(1),$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2))) \ + $(call gb_cxx_dep_generation_options,$(1),$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(7))) \ -c $(patsubst %.cxx,%.hxx,$(3)) \ -o$(1) \ - $(call gb_cxx_dep_copy,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2))) \ + $(call gb_cxx_dep_copy,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(7))) \ ) endef |