summaryrefslogtreecommitdiff
path: root/external/firebird
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-11-06 19:41:30 +0000
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-11-06 19:41:30 +0000
commit31fd531b2757269dde108b362752f7949615736a (patch)
tree373e19d27475709d26c8f1222a2604b6a5225662 /external/firebird
parent0351eaf42f4ebda8564f0f7cdf32706dfff735f6 (diff)
Revert "Make libatomic_ops buildable and enable on non-X86."
(Pushed from wrong branch -- incomplete/broken.) This reverts commit 0351eaf42f4ebda8564f0f7cdf32706dfff735f6.
Diffstat (limited to 'external/firebird')
-rw-r--r--external/firebird/ExternalProject_firebird.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 871286f1756b..b87b4d3e0e43 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -29,12 +29,7 @@ $(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 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) \