configure says they are "Some influential environment variables" and we don't
touch them anywhere within build.sh. So if they're already set, they'll be set
for configure anyway.

The only exception is CFLAGS which is modified with -g. Just export that one
where we change it and move on.

Signed-off-by: Peter Hutterer <[email protected]>
---
 build.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 92c3f34..b020ace 100755
--- a/build.sh
+++ b/build.sh
@@ -670,12 +670,7 @@ process() {
            ${LIBDIR_USER:+--libdir="$LIBDIR"} \
            ${LOCALSTATEDIR_USER:+--localstatedir="$LOCALSTATEDIR"} \
            ${QUIET:+--quiet} \
-           ${CONFFLAGS} $confopts \
-           ${CC:+CC="$CC"} \
-           ${CPP:+CPP="$CPP"} \
-           ${CPPFLAGS:+CPPFLAGS="$CPPFLAGS"} \
-           ${CFLAGS:+CFLAGS="$CFLAGS"} \
-           ${LDFLAGS:+LDFLAGS="$LDFLAGS"}
+           ${CONFFLAGS} $confopts
        if [ $? -ne 0 ]; then
            failed ${CONFCMD} $module $component
            cd $old_pwd
@@ -1350,6 +1345,7 @@ do
        ;;
     -g)
        CFLAGS="${CFLAGS} -g3 -O0"
+       export CFLAGS
        ;;
     -h|--help)
        usage
-- 
2.13.5

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to