Changeset - r9050:f68292b36385
[Not reviewed]
master
0 1 0
rubidium - 17 years ago 2008-04-24 20:07:12
rubidium@openttd.org
(svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
1 file changed with 17 insertions and 4 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -419,11 +419,11 @@ check_params() {
 

	
 
	detect_awk
 

	
 
	detect_os
 

	
 
	check_build
 
	check_host
 

	
 
	detect_os
 

	
 
# We might enable universal builds always on OSX targets.. but currently we don't
 
#	if [ "$enable_universal" = "1" ]  && [ "$os" != "OSX" ]; then
 
	if [ "$enable_universal" = "1" ]; then
 
@@ -1347,13 +1347,26 @@ check_compiler() {
 
}
 

	
 
check_build() {
 
	check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine"
 
	if [ "$os" = "FREEBSD" ]; then
 
		# FreeBSD's C compiler does not support dump machine.
 
		# However, removing C support is not possible because PSP must be linked with the C compiler.
 
		check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CXX" "g++" "c++" "0" "-dumpmachine"
 
	else
 
		check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine"
 
	fi
 
}
 

	
 
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"
 

	
 
	if [ "$os" = "FREEBSD" ]; then
 
		# FreeBSD's C compiler does not support dump machine.
 
		# However, removing C support is not possible because PSP must be linked with the C compiler.
 
		check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CXX" "g++" "c++" "0" "-dumpmachine"
 
	else
 
		check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine"
 
	fi
 
}
 

	
 
check_cxx_build() {
0 comments (0 inline, 0 general)