summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-12-09 02:33:13 +0100
committerLuboš Luňák <l.lunak@suse.cz>2012-12-10 14:46:49 +0100
commitac8ad75c10f040a0bae0950d36c5b5e06627e0ab (patch)
treef0bdd11cbe1bc1dd5b82cbc9bf26be8f1b961b4c /solenv
parentf7745c6624a02c2fb222a906be7d8b83c9394c20 (diff)
fix visibility with PCH
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/LinkTarget.mk10
-rw-r--r--solenv/gbuild/platform/com_GCC_class.mk2
2 files changed, 12 insertions, 0 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 22575ceaf0eb..5923f772b077 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1212,6 +1212,10 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(DEFS)
$(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 :=
+
ifeq ($(gb_FULLDEPS),$(true))
-include \
$(call gb_PrecompiledHeader_get_dep_target,$(3)) \
@@ -1283,6 +1287,12 @@ $(call gb_LinkTarget_get_target,$(1)) : VISIBILITY := default
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : VISIBILITY := default
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
endef
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 8d2799e45912..4835802b436a 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -156,6 +156,7 @@ $(call gb_Helper_abbreviate_dirs,\
-x c++-header \
$(4) $(5) \
$(gb_COMPILERDEPFLAGS) \
+ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(6) \
$(call gb_cxx_dep_generation_options,$(1),$(call gb_PrecompiledHeader_get_dep_target,$(2))) \
-c $(patsubst %.cxx,%.hxx,$(3)) \
@@ -176,6 +177,7 @@ $(call gb_Helper_abbreviate_dirs,\
-x c++-header \
$(4) $(5) \
$(gb_COMPILERDEPFLAGS) \
+ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(6) \
$(call gb_cxx_dep_generation_options,$(1),$(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) \
-c $(patsubst %.cxx,%.hxx,$(3)) \