diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/libatomic_ops/ExternalProject_libatomic_ops.mk | 2 | ||||
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 2 | ||||
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 4 | ||||
| -rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 2 | ||||
| -rw-r--r-- | external/poppler/ExternalProject_poppler.mk | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk b/external/libatomic_ops/ExternalProject_libatomic_ops.mk index 28384ad57f24..afbad2e04930 100644 --- a/external/libatomic_ops/ExternalProject_libatomic_ops.mk +++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk @@ -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) \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 9e6833117cdf..90d453cc33e0 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -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) diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 66022d530f03..126f250ffb48 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -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- diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index ce60e892db61..8d721b1ea9ba 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -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) \ ) diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk index 278807e0b337..55d8416a7d37 100644 --- a/external/poppler/ExternalProject_poppler.mk +++ b/external/poppler/ExternalProject_poppler.mk @@ -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 \ |