Pass the boost suffix down when using --build with acprep.
This commit is contained in:
parent
b6078393b6
commit
2a299ebca3
1 changed files with 4 additions and 3 deletions
7
acprep
7
acprep
|
|
@ -280,10 +280,11 @@ if [ ! "$BUILD_DIR" = "false" ]; then
|
||||||
cd "$BUILD_DIR" || (echo "Cannot change to $BUILD_DIR"; exit 1)
|
cd "$BUILD_DIR" || (echo "Cannot change to $BUILD_DIR"; exit 1)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
SWITCHES="$SWITCHES --with-boost-suffix='$BOOST_SUFFIX'"
|
||||||
|
|
||||||
"$HERE/configure" --srcdir="$HERE" CXX="$CXX" \
|
"$HERE/configure" --srcdir="$HERE" CXX="$CXX" \
|
||||||
CPPFLAGS="$CPPFLAGS" CXXFLAGS="$CXXFLAGS $local_cxxflags" \
|
CPPFLAGS="$CPPFLAGS" CXXFLAGS="$CXXFLAGS $local_cxxflags" \
|
||||||
LDFLAGS="$LDFLAGS" LIBS="$LIBS" $SWITCHES \
|
LDFLAGS="$LDFLAGS" LIBS="$LIBS" $SWITCHES
|
||||||
--with-boost-suffix="$BOOST_SUFFIX"
|
|
||||||
|
|
||||||
# Alter the Makefile so that it's not nearly so verbose. This makes errors
|
# Alter the Makefile so that it's not nearly so verbose. This makes errors
|
||||||
# and warnings much easier to spot.
|
# and warnings much easier to spot.
|
||||||
|
|
@ -298,6 +299,6 @@ fi
|
||||||
# options.
|
# options.
|
||||||
|
|
||||||
if [ $DO_BUILD = true ]; then
|
if [ $DO_BUILD = true ]; then
|
||||||
echo "make ARCHFLAGS=\"$ARCHFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\" CXXFLAGS=\"$CXXFLAGS\" DISTCHECK_CONFIGURE_FLAGS=\"--disable-dependency-tracking\" $@" > make.sh
|
echo "make ARCHFLAGS=\"$ARCHFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\" CXXFLAGS=\"$CXXFLAGS\" DISTCHECK_CONFIGURE_FLAGS=\"$SWITCHES\" $@" > make.sh
|
||||||
sh -x make.sh
|
sh -x make.sh
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue