Merge commit '84d6d69fc69662b2709fffbeaf3c3b4f53c535b1'

This commit is contained in:
Pieter Wuille
2013-08-18 00:58:04 +02:00
6 changed files with 107 additions and 9 deletions

View File

@@ -12,7 +12,7 @@ OPT ?= -O2 -DNDEBUG # (A) Production use (optimized mode)
#-----------------------------------------------
# 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 ./)
# this file is generated by the previous line to set build flags and sources
include build_config.mk