summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Merinov <n.merinov@samsung.com>2019-02-12 06:34:00 (GMT)
committerNikolai Merinov <n.merinov@samsung.com>2019-02-12 06:52:21 (GMT)
commit7be4274dc37cad80078c81e35c72170efc534bab (patch)
tree2a9cc83ca4209e9a9eecffd31cb2a6feddd2a9cc
parent5a5f223066da7a5a797ac37482ec1fd55ad12e9e (diff)
downloadboost-7be4274dc37cad80078c81e35c72170efc534bab.zip
boost-7be4274dc37cad80078c81e35c72170efc534bab.tar.gz
boost-7be4274dc37cad80078c81e35c72170efc534bab.tar.bz2
Use user-passed CFLAGS for compilation for clang toolset
-rw-r--r--tools/build/src/engine/build.jam2
-rwxr-xr-xtools/build/src/engine/build.sh7
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/build/src/engine/build.jam b/tools/build/src/engine/build.jam
index 0263d46..66d3be1 100644
--- a/tools/build/src/engine/build.jam
+++ b/tools/build/src/engine/build.jam
@@ -192,7 +192,7 @@ toolset como como : "-o " : -D
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
## Clang Linux 2.8+
toolset clang clang : "-o " : -D
- : -Wno-unused -Wno-format
+ : -Wno-unused -Wno-format $(CFLAGS)
[ opt --release : -Os ]
[ opt --debug : -g -O0 -fno-inline ]
[ opt --profile : -finline-functions -g ]
diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh
index 6dbc706..57bcca1 100755
--- a/tools/build/src/engine/build.sh
+++ b/tools/build/src/engine/build.sh
@@ -121,6 +121,10 @@ esac
BOOST_JAM_OPT_JAM="-o bootstrap/jam0"
BOOST_JAM_OPT_MKJAMBASE="-o bootstrap/mkjambase0"
BOOST_JAM_OPT_YYACC="-o bootstrap/yyacc0"
+
+BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
+BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
+BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
case $BOOST_JAM_TOOLSET in
mingw)
if test -r ${BOOST_JAM_TOOLSET_ROOT}bin/gcc ; then
@@ -237,9 +241,6 @@ case $BOOST_JAM_TOOLSET in
cc)
if test -z "$CC" ; then CC=cc ; fi
BOOST_JAM_CC=$CC
- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
;;
qcc)