diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 18:40:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:10 +0100 |
| commit | adddbbc4c6cfdcb120eb2f51ee3b88409a2d09b4 (patch) | |
| tree | d6a4d6f0d56dc3e19188931add5cf642f6320589 /external/liborcus | |
| parent | 5c0e6d86a8c9566249df0c0a4bbecc1ca8124a64 (diff) | |
normalize values of SYSTEM_BOOST
Change-Id: I2fce6545d7f279e0e2d6f3ff53eee1ab82314135
Diffstat (limited to 'external/liborcus')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 432423a2a3e4..a62855d4e3ea 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -35,7 +35,7 @@ liborcus_LIBS= ifneq ($(SYSTEM_ZLIB),) liborcus_LIBS+=-lz endif -ifeq ($(SYSTEM_BOOST),YES) +ifneq ($(SYSTEM_BOOST),) liborcus_LIBS+=$(BOOST_SYSTEM_LIB) else liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem @@ -52,7 +52,7 @@ ifeq ($(SYSTEM_ZLIB),) liborcus_CPPFLAGS+=$(ZLIB_CFLAGS) endif # patched boost needs to find config_global.h -ifeq ($(SYSTEM_BOOST),NO) +ifeq ($(SYSTEM_BOOST),) liborcus_CPPFLAGS += -I$(BUILDDIR)/config_$(gb_Side) endif # @@ -73,7 +73,7 @@ liborcus_LDFLAGS=$(LDFLAGS) ifeq ($(COM),MSC) liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) endif -ifeq ($(SYSTEM_BOOST),NO) +ifeq ($(SYSTEM_BOOST),) liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost else liborcus_LDFLAGS+=$(BOOST_LDFLAGS) @@ -96,7 +96,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --disable-spreadsheet-model \ --disable-werror \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter NO,$(SYSTEM_BOOST)),--with-boost-system=boostsystem) \ + $(if $(SYSTEM_BOOST),,--with-boost-system=boostsystem) \ && $(if $(VERBOSE)$(verbose),V=1) \ $(MAKE) \ ) |