twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-27 23:14:24 +00:00
Code Issues Projects Releases Wiki Activity

When passing CC or CXX down to sub-makes, add quotes around it so that

Browse Source 
blanks (say, CC=ccache distcc gcc -m64) don't mess things up.
This commit is contained in:
Miguel Freitas 2014-01-09 22:48:58 -02:00
parent 6c6c3fa0a2
commit be34510a9a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/leveldb/Makefile
View File

@ -12,7 +12,7 @@ OPT ?= -O2 -DNDEBUG # (A) Production use (optimized mode)
#----------------------------------------------- #-----------------------------------------------
# detect what platform we're building on # detect what platform we're building on
$(shell CC=$(CC) CXX=$(CXX) TARGET_OS=$(TARGET_OS) \ $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS=$(TARGET_OS) \
./build_detect_platform build_config.mk ./) ./build_detect_platform build_config.mk ./)
# this file is generated by the previous line to set build flags and sources # this file is generated by the previous line to set build flags and sources
include build_config.mk include build_config.mk

4
src/makefile.unix
View File

@ -170,7 +170,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a: leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd .. @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC="$(CC)" CXX="$(CXX)" OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
# #
# libtorrent hack # libtorrent hack
@ -183,7 +183,7 @@ DEFS += -DTORRENT_DEBUG
DEFS += -DBOOST_ASIO_SEPARATE_COMPILATION DEFS += -DBOOST_ASIO_SEPARATE_COMPILATION
#DEFS += -DBOOST_ASIO_DYN_LINK #DEFS += -DBOOST_ASIO_DYN_LINK
../libtorrent/src/.libs/libtorrent-rasterbar.a: ../libtorrent/src/.libs/libtorrent-rasterbar.a:
@echo "Building libtorrent ..." && cd ../libtorrent && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" && cd ../src @echo "Building libtorrent ..." && cd ../libtorrent && $(MAKE) CC="$(CC)" CXX="$(CXX)" OPT="$(xCXXFLAGS)" && cd ../src
# auto-generated dependencies: # auto-generated dependencies: