diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-09-05 16:27:50 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-11-06 13:20:34 -0600 |
| commit | 0351eaf42f4ebda8564f0f7cdf32706dfff735f6 (patch) | |
| tree | 2d8a2cfc6f7b301c1fb179632ca627201595d10e /external | |
| parent | 7813bd3113beb2b2860f9eb213c5c67ef54f5bf0 (diff) | |
Make libatomic_ops buildable and enable on non-X86.
Change-Id: I9423672b03caa4d500d44155bc47d4a8fa10c3cb
Reviewed-on: https://gerrit.libreoffice.org/5812
Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 7 | ||||
| -rw-r--r-- | external/libatomic_ops/Module_libatomic_ops.mk | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index b87b4d3e0e43..871286f1756b 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -29,7 +29,12 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(call gb_ExternalProject_run,build,\ unset MAKEFLAGS \ && export PKG_CONFIG="" \ - && export CXXFLAGS=" \ + && export CPPFLAGS=" \ + $(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \ + -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \ + ,$(LIBATOMIC_OPS_CFLAGS)) \ + " \ + && export CFLAGS=" \ $(if $(filter NO,$(SYSTEM_BOOST)), \ -I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS) \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib) \ diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk index 7dca6703c868..0a9a534630de 100644 --- a/external/libatomic_ops/Module_libatomic_ops.mk +++ b/external/libatomic_ops/Module_libatomic_ops.mk @@ -9,9 +9,13 @@ $(eval $(call gb_Module_Module,libatomic_ops)) +ifeq ($(SYSTEM_LIBATOMIC_OPS),NO) + $(eval $(call gb_Module_add_targets,libatomic_ops,\ ExternalProject_libatomic_ops \ UnpackedTarball_libatomic_ops \ )) +endif + # vim: set noet sw=4 ts=4: |