From 861bda91d5a61b2cd9e3dbb00ce47f9d804fd1ae Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 15 Mar 2011 22:37:04 +0000 Subject: [PATCH] win32: Strip unneeded flags from env.sh This remove CXXFLAGS since we don't have any c++ code in Clutter and also removes the redundant -L$ROOT_DIR/lib from LDFLAGS and -I$ROOT_DIR/include from CPPFLAGS and CFLAGS. (These should get added by pkg-config) --- build/mingw/mingw-fetch-dependencies.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/mingw/mingw-fetch-dependencies.sh b/build/mingw/mingw-fetch-dependencies.sh index e62be6b5c..d1b4d3c1c 100755 --- a/build/mingw/mingw-fetch-dependencies.sh +++ b/build/mingw/mingw-fetch-dependencies.sh @@ -325,10 +325,8 @@ find_compiler; add_env PKG_CONFIG_PATH "$ROOT_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH"; -add_env LDFLAGS "-L$ROOT_DIR/lib -mno-cygwin \$LDFLAGS" -add_env CPPFLAGS "-I$ROOT_DIR/include \$CPPFLAGS" -add_env CFLAGS "-I$ROOT_DIR/include -mno-cygwin -mms-bitfields -march=i686 \${CFLAGS:-"-g"}" -add_env CXXFLAGS "-I$ROOT_DIR/include -mno-cygwin -mms-bitfields -march=i686 \${CFLAGS:-"-g"}" +add_env LDFLAGS "-mno-cygwin \$LDFLAGS" +add_env CFLAGS "-mno-cygwin -mms-bitfields \$CFLAGS" cat >> "$env_file" <