diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-03 15:16:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-03 16:02:12 +0100 |
| commit | 1fa1c73f6801b3cea6cc01d4ea815929ef213103 (patch) | |
| tree | 8cc33ceab6da434d047d4662499843e3a9c4e623 /cppunit | |
| parent | 49440d2588466b257b505a7e580d58b46d58b158 (diff) | |
cppunit: CXXFLAGS should be set only once
Change-Id: I67e38db4b41849ac4be4ad20825391c84c7ed412
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/ExternalProject_cppunit.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk index 02cccb38d58d..8a2d97c36288 100644 --- a/cppunit/ExternalProject_cppunit.mk +++ b/cppunit/ExternalProject_cppunit.mk @@ -45,10 +45,10 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : --disable-latex-docs \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \ - $(if $(filter-out WNT,$(OS)),,CXXFLAGS="-mthreads" LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \ + $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \ - CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG))) \ + CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \ $(if $(debug),-g)" \ && cd src \ && $(MAKE) \ |