diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 19:04:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:08 +0100 |
| commit | 23647595d77b85b5dac0d5762987a3ba2533ffd9 (patch) | |
| tree | f7fe77edb89792eabd184f2d2aa7ec27513b0dfb /external | |
| parent | e3abec3f07f2a710bfce66f77b33f494e2aa4972 (diff) | |
normalize values of SYSTEM_LIBATOMIC_OPS, SYSTEM_FIREBIRD
Change-Id: I89802da0ad7f7bf838a8937430825b0adf42a6ee
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 6 | ||||
| -rw-r--r-- | external/libatomic_ops/Module_libatomic_ops.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index cb3e35d10b38..692a81a78a8d 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -30,9 +30,9 @@ $(call gb_ExternalProject_get_state_target,firebird,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)) \ + $(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \ + ) \ " \ && export CXXFLAGS=" \ $(if $(filter NO,$(SYSTEM_BOOST)), \ diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk index 0a9a534630de..2ea7e546be66 100644 --- a/external/libatomic_ops/Module_libatomic_ops.mk +++ b/external/libatomic_ops/Module_libatomic_ops.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libatomic_ops)) -ifeq ($(SYSTEM_LIBATOMIC_OPS),NO) +ifeq ($(SYSTEM_LIBATOMIC_OPS),) $(eval $(call gb_Module_add_targets,libatomic_ops,\ ExternalProject_libatomic_ops \ |