cpp/openttd-patchpack/source Changeset - r5980:45fd1760f9c7

Changeset - r5980:45fd1760f9c7

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truelight - 18 years ago 2007-02-11 17:36:46
truelight@openttd.org

(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
-Fix: 'checking host g++/gcc' is silly, changed it to 'checking host c++/cc'

1 file changed with 7 insertions and 7 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -322,14 +322,14 @@ check_params() { @@
 		log 1 "checking universal build... no"
 	else
 		log 1 "checking universal build... yes"
 	fi
 	# Already detected by check_build
 	log 1 "checking for build gcc... $cc_build"
 	log 1 "checking for host gcc... $cc_host"
 	log 1 "checking build cc... $cc_build"
 	log 1 "checking host cc... $cc_host"
 	check_cxx_build
 	check_cxx_host
 	check_windres
 	check_strip
 	check_lipo
@@ @@ -341,22 +341,22 @@ check_params() { @@
 		else
 			enable_static="0"
 		fi
 	fi
 	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
 			log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS"
 			log 1 "WARNING: use static at your own risk on this platform"
 			sleep 5
 		fi
 	else
-		log 1 "checking for static... no"
 		log 1 "checking static... no"
 	fi
 	# Show what we configured
 	if [ "$enable_debug" = "0" ]; then
 		log 1 "using debug level... no"
 	elif [ "$enable_profiling" != "0" ]; then
@@ @@ -1002,31 +1002,31 @@ check_host() { @@
 	# By default the host is the build
 	if [ -z "$host" ]; then host="$build"; fi
 	check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine"
+}
 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() {
 	# By default the host is the build
 	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() {
 	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
 		check_compiler "host windres" "windres" "$host" "$windres" "$WINDRES" "windres" "windres" "2" "-V"
 	fi
+}
 check_strip() {
 	if [ "$os" = "OS2" ]; then
 		# 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
 		# 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
 		$cc_host strip.test.c -o strip.test
 		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
 		rm -f strip.test.c strip.test

0 comments (0 inline, 0 general)