matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure: move toolchain init to a function 

The layout of this file uses functions to update Config.  Move the
toolchain logic to the same style to fix setting the vars in Config.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2012-12-16 17:09:15 -05:00 committed by Stephen Hemminger
parent cbe195dc6b
commit 601f60e552
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -2,14 +2,19 @@
# This is not an autconf generated configure # This is not an autconf generated configure
# #
INCLUDE=${1:-"$PWD/include"} INCLUDE=${1:-"$PWD/include"}
: ${PKG_CONFIG:=pkg-config}
: ${CC=gcc}
echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
# Make a temp directory in build tree. # Make a temp directory in build tree.
TMPDIR=$(mktemp -d config.XXXXXX) TMPDIR=$(mktemp -d config.XXXXXX)
trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM
check_toolchain()
{
: ${PKG_CONFIG:=pkg-config}
: ${CC=gcc}
echo "CC:=${CC}" >>Config
echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
}
check_atm() check_atm()
{ {
cat >$TMPDIR/atmtest.c <<EOF cat >$TMPDIR/atmtest.c <<EOF
@ -224,6 +229,7 @@ rm -f $TMPDIR/ipsettest.c $TMPDIR/ipsettest
} }
echo "# Generated config based on" $INCLUDE >Config echo "# Generated config based on" $INCLUDE >Config
check_toolchain
echo "TC schedulers" echo "TC schedulers"