Kaydet (Commit) fc6f894d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Pass -fvisibility-inlines-hidden into external modules

Change-Id: Icf872e269c7e427ba1287ccd0082974c9426449e
üst ce0e240e
......@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libatomic_ops,\
$(call gb_ExternalProject_get_state_target,libatomic_ops,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \
./configure \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
......
......@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif
endif
liborcus_CXXFLAGS=$(CXXFLAGS)
liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)
liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
......
......@@ -21,9 +21,9 @@ liborcus_patches :=
# don't use dllimport
liborcus_patches += liborcus_0.1.0-dllimport.patch
ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via
# gb_VISIBILITY_FLAGS[_CXX]:
liborcus_patches += visibility.patch
endif
# <https://gitorious.org/orcus/orcus/merge_requests/2#
# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
......
......@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
--disable-debug \
$(if $(filter MACOSX,$(OS)),--disable-werror) \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
......
......@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,poppler,\
$(call gb_ExternalProject_get_state_target,poppler,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \
MAKE=$(MAKE) ./configure \
--with-pic \
--enable-static \
......
......@@ -92,9 +92,10 @@ ifeq (,$(filter -fvisibility=hidden,$(CC)))
gb_VISIBILITY_FLAGS += -fvisibility=hidden
endif
ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE)
gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden
gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
endif
endif
gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
gb_CFLAGS_COMMON += -fstack-protector-strong
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment