r2817 - trunk

[mikma at minisip.org]

Author: mikma
Date: 2006-10-05 18:27:47 +0200 (Thu, 05 Oct 2006)
New Revision: 2817

Modified:
   trunk/build.pl
Log:
Add cpp, CXX and CPP and handle cross compiler in envdump


Modified: trunk/build.pl
===================================================================
--- trunk/build.pl	2006-10-04 13:45:44 UTC (rev 2816)
+++ trunk/build.pl	2006-10-05 16:27:47 UTC (rev 2817)
@@ -652,14 +652,27 @@
 
 sub _first_line { $_[0] }
 sub cb_envdump_pre {
+	my $gxx;
+	my $cpp;
+	my $ld;
+	if (cross_compiling()) {
+	    $gxx = "$hostspec-g++";
+	    $cpp = "$hostspec-cpp";
+	    $ld = "$hostspec-ld";
+	} else {
+	    $gxx = $ENV{CXX} || 'g++';
+	    $cpp = $ENV{CPP} || 'cpp';
+	    $ld = 'ld';
+	}
 	print "Working Copy ", `svn info | grep ^Rev`;
 	print "pkg-config: ", _first_line(`pkg-config --version`);
 	print "autoconf: ", _first_line(`autoconf --version`);
 	print "automake: ", _first_line(`automake --version`);
 	print " libtool: ", _first_line(`libtool --version`);
 	print "    make: ", _first_line(`make --version`);
-	print "     g++: ", _first_line(`g++ --version`);
-	print "      ld: ", _first_line(`ld --version`);
+	print "     g++: ", _first_line(`$gxx --version`);
+	print "     cpp: ", _first_line(`$cpp --version`);
+	print "      ld: ", _first_line(`$ld --version`);
 	print "\n";
 	$show_env = 1; 
 	show_env();
@@ -896,13 +909,13 @@
 }
 
 sub pretty_env_paths {
-	my $value = '' . $_[0];
+	my $value = $_[0] || '';
 	$value =~ s/$topdir/\${topdir}/g;
 	return $value;
 }
 sub show_env {
 	return unless $show_env;
-	my @envvars = qw( CXXFLAGS CPPFLAGS LDFLAGS PATH );
+	my @envvars = qw( CXX CPP CXXFLAGS CPPFLAGS LDFLAGS PATH );
 	push @envvars, qw( PKG_CONFIG_PATH ACLOCAL_FLAGS LD_LIBRARY_PATH )
 		unless $pkg;
 	push @envvars, 'CCACHE_DIR' if $ccache;