File boost-jam-jam0_use_passed_cflags.diff of Package boost-jam
Index: build.jam
===================================================================
--- build.jam.orig 2011-06-06 22:36:21.000000000 +0200
+++ build.jam 2012-03-12 18:25:08.807795758 +0100
@@ -212,7 +212,7 @@ toolset darwin cc : "-o " : -D
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : "-o " : -D
: -pedantic -fno-strict-aliasing
- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
+ [ opt --release : [ opt --symbols : -g : -s ] $(CFLAGS) ]
[ opt --debug : -g -O0 -fno-inline ]
-I$(--python-include) -I$(--extra-include) -Wno-long-long
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
Index: build.sh
===================================================================
--- build.sh.orig 2012-03-12 18:25:08.777796478 +0100
+++ build.sh 2012-03-12 18:25:08.807795758 +0100
@@ -12,7 +12,7 @@ BOOST_JAM_TOOLSET=
echo_run ()
{
echo "$@"
- $@
+ eval "$@"
r=$?
if test $r -ne 0 ; then
exit $r
@@ -299,5 +299,9 @@ if test -x "./bootstrap/jam0" ; then
if test "${BJAM_UPDATE}" != "update" ; then
echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" clean
fi
- echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
+ if test -z "$BOOST_JAM_TOOLSET_ROOT"; then
+ echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "$@"
+ else
+ echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
+ fi
fi