diff options
| author | Patrick Jenkins <pjenkins@apple.com> | 2006-07-14 20:44:09 +0000 |
|---|---|---|
| committer | Patrick Jenkins <pjenkins@apple.com> | 2006-07-14 20:44:09 +0000 |
| commit | 79fbf7fe27f8532f5e1eabdbb5524504356ad075 (patch) | |
| tree | 9e5954fa308ce4c5ed41337f2bff4c64591e3d9e | |
| parent | 1fe8f6bcef83844cf040299a0d92e497fd752806 (diff) | |
Fixed an issue where the user specified gcc was not the gcc we report to the nightly test server.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29144 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | utils/NewNightlyTest.pl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl index a5d669ff7e..6eabad1e37 100755 --- a/utils/NewNightlyTest.pl +++ b/utils/NewNightlyTest.pl @@ -138,7 +138,10 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) { $CONFIGUREARGS .= "--with-externals=$ARGV[0]"; shift; next; } if (/^-nickname$/) { $nickname = "$ARGV[0]"; shift; next; } - if (/^-gccpath/) { $CONFIGUREARGS .= " CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; shift; next;} + if (/^-gccpath/) { $CONFIGUREARGS .= " CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; + $GCCPATH=$ARGV[0]; + shift; + next;} if (/^-cvstag/) { $CVSCOOPT .= " -r $ARGV[0]"; shift; next; } else{ $CVSCOOPT="";} if (/^-target/) { $CONFIGUREARGS .= " --target=$ARGV[0]"; shift; next; @@ -953,7 +956,12 @@ my $dejagnulog_full; @DEJAGNULOG_FULL = ReadFile "$DejagnuTestsLog"; $dejagnulog_full = join("\n", @DEJAGNULOG_FULL); -my $gcc_version_long = `gcc --version`; +if($GCCPATH){ + my $gcc_version_long = `$ARGV[0]/gcc --version`; +} +else{ + my $gcc_version_long = `gcc --version`; +} @GCC_VERSION = split "\n", $gcc_version_long; my $gcc_version = $GCC_VERSION[0]; |