diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-07-17 14:17:43 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-07-17 19:21:58 +0000 |
| commit | 2bf530153e9fb24aef62bf5e16e23ea1412887dd (patch) | |
| tree | 6fe9b39e97a68a24b8039d8fd73173ebb86a653a /solenv/gbuild/LinkTarget.mk | |
| parent | 32f8e2ae7f087f1457167293ee77397a5876a4f0 (diff) | |
kill gb_NoexPrecompiledHeader
Change-Id: I34b6cc6eceb8f326ba7e353d3d1aee3c93ea02bd
Reviewed-on: https://gerrit.libreoffice.org/4956
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 3b648060c03d..5316b0915699 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -146,18 +146,13 @@ ifneq ($(strip $$(PCH_NAME)),) ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS))) $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME)) else -ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS))) -$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME)) -else $$(info No precompiled header available for $$*.cxx .) -$$(info precompiled header flags ( ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS))) -$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS))) -$$(info . object flags : $$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS))) +$$(info precompiled header flags : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS))) +$$(info . object flags : $$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS))) $$@ : PCHFLAGS := endif endif endif -endif endef ifneq ($(COMPILER_PLUGIN_TOOL),) @@ -1272,15 +1267,10 @@ define gb_LinkTarget__set_precompiled_header_impl $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3)) $(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_get_clean_target,$(3)) -$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx - $(call gb_PrecompiledHeader_get_target,$(3)) : $(call gb_LinkTarget_get_headers_target,$(1)) -$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(call gb_LinkTarget_get_headers_target,$(1)) $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3) $(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX = $(call gb_PrecompiledHeader_get_objectfile, $(call gb_PrecompiledHeader_get_target,$(3))) -$(call gb_LinkTarget_get_target,$(1)) : PCHOBJNOEX = $(call gb_NoexPrecompiledHeader_get_objectfile, $(call gb_NoexPrecompiledHeader_get_target,$(3))) $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX) $(call gb_LinkTarget_get_headers_target,$(1)) \ @@ -1289,15 +1279,11 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1)) $(call gb_PrecompiledHeader_get_target,$(3)) : VISIBILITY := -$(call gb_NoexPrecompiledHeader_get_target,$(3)) : VISIBILITY := $(call gb_PrecompiledHeader_get_timestamp,$(1)) : $(call gb_PrecompiledHeader_get_target,$(3)) -$(call gb_NoexPrecompiledHeader_get_timestamp,$(1)) : $(call gb_NoexPrecompiledHeader_get_target,$(3)) ifeq ($(gb_FULLDEPS),$(true)) --include \ - $(call gb_PrecompiledHeader_get_dep_target,$(3)) \ - $(call gb_NoexPrecompiledHeader_get_dep_target,$(3)) +-include $(call gb_PrecompiledHeader_get_dep_target,$(3)) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(DEFS) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1)) endif @@ -1372,7 +1358,6 @@ endif ifeq ($(gb_ENABLE_PCH),$(true)) ifneq ($(strip $$(PCH_NAME)),) $(call gb_PrecompiledHeader_get_target,$$(PCH_NAME)) : VISIBILITY := default -$(call gb_NoexPrecompiledHeader_get_target,$$(PCH_NAME)) : VISIBILITY := default endif endif |