gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used

Browse Source 
-Fix: 'checking host g++/gcc' is silly, changed it to 'checking host c++/cc'
This commit is contained in:
truelight 2007-02-11 17:36:46 +00:00
parent 53785810c8
commit 6afa186e7c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.lib
View File

@ -325,8 +325,8 @@ check_params() {
fi fi
# Already detected by check_build # Already detected by check_build
log 1 "checking for build gcc... $cc_build" log 1 "checking build cc... $cc_build"
log 1 "checking for host gcc... $cc_host" log 1 "checking host cc... $cc_host"
check_cxx_build check_cxx_build
check_cxx_host check_cxx_host
@ -344,7 +344,7 @@ check_params() {
fi fi
if [ "$enable_static" != "0" ]; then if [ "$enable_static" != "0" ]; then
log 1 "checking for static... yes" log 1 "checking static... yes"
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]; then if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]; then
log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS" log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS"
@ -353,7 +353,7 @@ check_params() {
sleep 5 sleep 5
fi fi
else else
log 1 "checking for static... no" log 1 "checking static... no"
fi fi
# Show what we configured # Show what we configured
@ -1005,13 +1005,13 @@ check_host() {
} }
check_cxx_build() { check_cxx_build() {
check_compiler "build g++" "cxx_build" "$build" "$cxx_build" "$CXX" "g++" "c++" 1 "-dumpmachine" check_compiler "build c++" "cxx_build" "$build" "$cxx_build" "$CXX" "g++" "c++" 1 "-dumpmachine"
} }
check_cxx_host() { check_cxx_host() {
# By default the host is the build # By default the host is the build
if [ -z "$host" ]; then host="$build"; fi if [ -z "$host" ]; then host="$build"; fi
check_compiler "host g++" "cxx_host" "$host" "$cxx_host" "$CXX" "g++" "c++" 1 "-dumpmachine" check_compiler "host c++" "cxx_host" "$host" "$cxx_host" "$CXX" "g++" "c++" 1 "-dumpmachine"
} }
check_windres() { check_windres() {
@ -1023,7 +1023,7 @@ check_windres() {
check_strip() { check_strip() {
if [ "$os" = "OS2" ]; then if [ "$os" = "OS2" ]; then
# OS2 via gcc is a bit weird.. stripping HAS to be done via emxbind, which is via gcc directly # OS2 via gcc is a bit weird.. stripping HAS to be done via emxbind, which is via gcc directly
echo "checking for host strip... using gcc -s option" echo "checking host strip... using gcc -s option"
elif [ "$os" = "OSX" ]; then elif [ "$os" = "OSX" ]; then
# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something # Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
echo "int main(int argc, char *argv[]) { }" > strip.test.c echo "int main(int argc, char *argv[]) { }" > strip.test.c