Change bootstrap.pl and startbuild.pl to also take CXX. (#1280)
This commit is contained in:
		
							parent
							
								
									49669f6585
								
							
						
					
					
						commit
						75fa198321
					
				@ -61,7 +61,7 @@ if ($^O !~ /MSWin/) {
 | 
				
			|||||||
my $conf_args = join(' ', @conf_argv);
 | 
					my $conf_args = join(' ', @conf_argv);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if ($argn > 0 && $^O !~ /MSWin/) {
 | 
					if ($argn > 0 && $^O !~ /MSWin/) {
 | 
				
			||||||
	$result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`;
 | 
						$result = `CC=$ARGV[0] CXX=$ARGV[1] python ../build/configure.py $conf_args`;
 | 
				
			||||||
} else {
 | 
					} else {
 | 
				
			||||||
	if ($^O =~ /MSWin/) {
 | 
						if ($^O =~ /MSWin/) {
 | 
				
			||||||
		$result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`;
 | 
							$result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`;
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,7 @@ chdir('../../../OUTPUT');
 | 
				
			|||||||
my $argn = $#ARGV + 1;
 | 
					my $argn = $#ARGV + 1;
 | 
				
			||||||
if ($argn > 0) {
 | 
					if ($argn > 0) {
 | 
				
			||||||
	$ENV{CC} = $ARGV[0];
 | 
						$ENV{CC} = $ARGV[0];
 | 
				
			||||||
	$ENV{CXX} = $ARGV[0];
 | 
						$ENV{CXX} = $ARGV[1];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
system("ambuild --no-color 2>&1");
 | 
					system("ambuild --no-color 2>&1");
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user