[Lldb-commits] [lldb] r153868 - /lldb/trunk/scripts/build-llvm.pl

[Jason Molenda]

Author: jmolenda
Date: Mon Apr  2 03:56:42 2012
New Revision: 153868

URL: http://llvm.org/viewvc/llvm-project?rev=153868&view=rev
Log:
Building llvm for multiple arches could cause problems
with some archs, tweak the way we update PATH to fix that.


Modified:
    lldb/trunk/scripts/build-llvm.pl

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=153868&r1=153867&r2=153868&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Mon Apr  2 03:56:42 2012
@@ -29,6 +29,8 @@
 our @archs = split (/\s+/, $ENV{ARCHS});
 my $os_release = 11;
 
+my $original_env_path = $ENV{PATH};
+
 our %llvm_config_info = (
  'Debug'         => { configure_options => '--disable-optimized --disable-assertions', make_options => 'DEBUG_SYMBOLS=1'},
  'Debug+Asserts' => { configure_options => '--disable-optimized --enable-assertions' , make_options => 'DEBUG_SYMBOLS=1'},
@@ -273,7 +275,7 @@
 						close (SCRIPT);
 					   	chmod($script_mode, $script_prog_path);
 					}
-					my $new_path = "$ENV{PATH}:$llvm_dstroot_arch_bin";
+					my $new_path = "$original_env_path:$llvm_dstroot_arch_bin";
 					print "Setting new environment PATH = '$new_path'\n";
 			        $ENV{PATH} = $new_path;
 				}