wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

Probably a good idea to use -D_GLIBCXX_FULLY_DYNAMIC_STRING here, too

Browse Source 
While at it, do the CXXFLAGS dance on separate lines as appends to a variable
for clarity, instead of in-line on the configure command line.

Change-Id: I61843ae82efdf341c7e33d3f08d5715a14fa2f40
This commit is contained in:
Tor Lillqvist
2013-04-16 13:31:15 +03:00
parent 7c0585c86e
commit bc88e110dd
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cppunit/ExternalProject_cppunit.mk
View File

@ -35,6 +35,29 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
,src/cppunit)
endif
else
cppunit_CXXFLAGS=$(CXXFLAGS)
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL))
cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG
endif
endif
ifeq ($(OS),MACOSX)
ifneq (,$(gb_ENABLE_DBGUTIL))
cppunit_CXXFLAGS+=-D_GLIBCXX_FULLY_DYNAMIC_STRING
endif
endif
ifeq ($(OS)-$(COM),WNT-GCC)
cppunit_CXXFLAGS+=-mthreads
endif
ifneq (,$(debug))
cppunit_CXXFLAGS+=-g
endif
$(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
./configure \
@ -48,8 +71,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(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 MACOSX,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \
$(if $(debug),-g)" \
CXXFLAGS="$(cppunit_CXXFLAGS)" \
&& cd src \
&& $(MAKE) \
)