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-07 01:05:55 -0600 |
commit | f479f62c140bbab3869b8e2e783ee0c3f72dab3a (patch) | |
tree | b6306eca52a912bb03158db05c669ffd48e63763 /external | |
parent | 628a812db0d9a53c1936874028c32c975153941d (diff) |
Make libatomic_ops buildable and enable on non-X86.
Change-Id: Iec1d329f143ab76de7e8b4acd3da66efb6e0220c
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>
Reviewed-on: https://gerrit.libreoffice.org/6600
Diffstat (limited to 'external')
-rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 12 | ||||
-rw-r--r-- | external/libatomic_ops/Module_libatomic_ops.mk | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index b87b4d3e0e43..97db740b8065 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -29,16 +29,22 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(call gb_ExternalProject_run,build,\ unset MAKEFLAGS \ && export PKG_CONFIG="" \ + && export CPPFLAGS=" \ + $(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \ + -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \ + ,$(LIBATOMIC_OPS_CFLAGS)) \ + " \ && export CXXFLAGS=" \ $(if $(filter NO,$(SYSTEM_BOOST)), \ - -I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS) \ - -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib) \ + -I$(call gb_UnpackedTarball_get_dir,boost) \ + -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ + ,$(BOOST_CPPFLAGS)) \ $(if $(filter NO,$(SYSTEM_ICU)), \ -I$(call gb_UnpackedTarball_get_dir,icu)/source \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ ,$(ICU_CPPFLAGS)) \ - -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ " \ && ./configure \ --without-editline \ 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: |