From 820765eea02802b88d7bfda4eaae2df97e047ac1 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 15 Mar 2011 20:17:21 +0000 Subject: [PATCH] win32: don't set CC,CPP,AR,NM,LD etc in mingw env.sh It shouldn't be necessary to explicitly override CC,CPP,AR,NM,LD etc in the env.sh helper script that mingw-fetch-dependencies.sh generates. Clutter's ./configure script should figure all of those out for us. --- build/mingw/mingw-fetch-dependencies.sh | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/build/mingw/mingw-fetch-dependencies.sh b/build/mingw/mingw-fetch-dependencies.sh index 981020b..f3d5481 100755 --- a/build/mingw/mingw-fetch-dependencies.sh +++ b/build/mingw/mingw-fetch-dependencies.sh @@ -150,32 +150,10 @@ function find_compiler () fi; fi; - CC="${MINGW_TOOL_PREFIX}gcc"; - add_env ADDR2LINE "${MINGW_TOOL_PREFIX}addr2line" - add_env AS "${MINGW_TOOL_PREFIX}as" - add_env CC "${CC}" - add_env CPP "${MINGW_TOOL_PREFIX}cpp" - add_env CPPFILT "${MINGW_TOOL_PREFIX}c++filt" - add_env CXX "${MINGW_TOOL_PREFIX}g++" - add_env DLLTOOL "${MINGW_TOOL_PREFIX}dlltool" - add_env DLLWRAP "${MINGW_TOOL_PREFIX}dllwrap" - add_env GCOV "${MINGW_TOOL_PREFIX}gcov" - add_env LD "${MINGW_TOOL_PREFIX}ld" - add_env NM "${MINGW_TOOL_PREFIX}nm" - add_env OBJCOPY "${MINGW_TOOL_PREFIX}objcopy" - add_env OBJDUMP "${MINGW_TOOL_PREFIX}objdump" - add_env READELF "${MINGW_TOOL_PREFIX}readelf" - add_env SIZE "${MINGW_TOOL_PREFIX}size" - add_env STRINGS "${MINGW_TOOL_PREFIX}strings" - add_env WINDRES "${MINGW_TOOL_PREFIX}windres" - add_env AR "${MINGW_TOOL_PREFIX}ar" - add_env RANLIB "${MINGW_TOOL_PREFIX}ranlib" - add_env STRIP "${MINGW_TOOL_PREFIX}strip" - TARGET="${MINGW_TOOL_PREFIX##*/}"; TARGET="${TARGET%%-}"; - echo "Using compiler $CC and target $TARGET"; + echo "Using compiler ${MINGW_TOOL_PREFIX}gcc and target $TARGET"; } # If a download directory hasn't been specified then try to guess one -- 2.7.4