Use user-passed CFLAGS for compilation for clang toolsetsandbox/nmerinov/llvm

2 files changed, 5 insertions, 4 deletions

diff --git a/build.jam b/build.jam
index 60adfb6..817ba2a 100644
--- a/build.jam
+++ b/build.jam
@@ -195,7 +195,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/build.sh b/build.sh
index f04be48..7c4a551 100755
--- a/build.sh
+++ b/build.sh
@@ -120,6 +120,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
@@ -224,9 +228,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)