[Scummvm-cvs-logs] scummvm master -> baea3be7a4481ad78dea1da1495fc623c77c7fa5
fuzzie
fuzzie at fuzzie.org
Tue Apr 23 23:08:49 CEST 2013
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ab50935afc CONFIGURE: Do not pass LDFLAGS to compiler when -c is specified
baea3be7a4 Merge pull request #321 from fingolfin/configure-fix-nolink
Commit: ab50935afcecc343a4b770f8248d0dc71485145d
https://github.com/scummvm/scummvm/commit/ab50935afcecc343a4b770f8248d0dc71485145d
Author: Max Horn (max at quendi.de)
Date: 2013-04-18T10:56:07-07:00
Commit Message:
CONFIGURE: Do not pass LDFLAGS to compiler when -c is specified
This fixes compatibility issues with clang when using -enable-Werror:
clang generates a warning when being passed both "-c" and linker-only
flags like "-L" or "-l". Combined with -Werror, this causes a spurious
configure failure.
Changed paths:
configure
diff --git a/configure b/configure
index 7064863..db347c1 100755
--- a/configure
+++ b/configure
@@ -230,7 +230,11 @@ cc_check_no_clean() {
echo >> "$TMPLOG"
echo "$CXX $LDFLAGS $CXXFLAGS $TMPC -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
rm -f "$TMPO$HOSTEXEEXT"
- ( $CXX $LDFLAGS $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+ if test "-c" = "$*" ; then
+ ( $CXX $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+ else
+ ( $CXX $LDFLAGS $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+ fi
TMPR="$?"
echo "return code: $TMPR" >> "$TMPLOG"
echo >> "$TMPLOG"
@@ -1566,7 +1570,7 @@ EOF
if test -n "$_host"; then
# In cross-compiling mode, we cannot run the result
- eval "$1 $CXXFLAGS $LDFLAGS -o $TMPO.o -c tmp_cxx_compiler.cpp" 2> /dev/null && cc_check_clean tmp_cxx_compiler.cpp
+ eval "$1 $CXXFLAGS -o $TMPO.o -c tmp_cxx_compiler.cpp" 2> /dev/null && cc_check_clean tmp_cxx_compiler.cpp
else
eval "$1 $CXXFLAGS $LDFLAGS -o $TMPO$HOSTEXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && eval "$TMPO$HOSTEXEEXT 2> /dev/null" && cc_check_clean tmp_cxx_compiler.cpp
fi
Commit: baea3be7a4481ad78dea1da1495fc623c77c7fa5
https://github.com/scummvm/scummvm/commit/baea3be7a4481ad78dea1da1495fc623c77c7fa5
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2013-04-23T14:07:54-07:00
Commit Message:
Merge pull request #321 from fingolfin/configure-fix-nolink
CONFIGURE: Do not pass LDFLAGS to compiler when -c is specified
Changed paths:
configure
More information about the Scummvm-git-logs
mailing list