From 1fa1c73f6801b3cea6cc01d4ea815929ef213103 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 3 Jan 2013 15:16:20 +0100 Subject: cppunit: CXXFLAGS should be set only once Change-Id: I67e38db4b41849ac4be4ad20825391c84c7ed412 --- cppunit/ExternalProject_cppunit.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cppunit') 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) \ -- cgit