mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-12 17:32:19 +00:00
NNT: Remove hard coded BuildDir and WebDir, users should have to specify these.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84481 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
7c9eb9ebab
commit
0e9fe69ae8
@ -112,9 +112,7 @@ $SVNURL = 'http://llvm.org/svn/llvm-project' unless $SVNURL;
|
|||||||
my $TestSVNURL = $ENV{"TestSVNURL"};
|
my $TestSVNURL = $ENV{"TestSVNURL"};
|
||||||
$TestSVNURL = 'http://llvm.org/svn/llvm-project' unless $TestSVNURL;
|
$TestSVNURL = 'http://llvm.org/svn/llvm-project' unless $TestSVNURL;
|
||||||
my $BuildDir = $ENV{'BUILDDIR'};
|
my $BuildDir = $ENV{'BUILDDIR'};
|
||||||
$BuildDir = "$HOME/buildtest" unless $BuildDir;
|
|
||||||
my $WebDir = $ENV{'WEBDIR'};
|
my $WebDir = $ENV{'WEBDIR'};
|
||||||
$WebDir = "$HOME/cvs/testresults-X86" unless $WebDir;
|
|
||||||
|
|
||||||
my $LLVMSrcDir = $ENV{'LLVMSRCDIR'};
|
my $LLVMSrcDir = $ENV{'LLVMSRCDIR'};
|
||||||
$LLVMSrcDir = "$BuildDir/llvm" unless $LLVMSrcDir;
|
$LLVMSrcDir = "$BuildDir/llvm" unless $LLVMSrcDir;
|
||||||
@ -221,10 +219,6 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
|
|||||||
print "Unknown option: $_ : ignoring!\n";
|
print "Unknown option: $_ : ignoring!\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!($CONFIG_PATH eq "")) {
|
|
||||||
die "error: -config mode is not yet implemented,";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($ENV{'LLVMGCCDIR'}) {
|
if ($ENV{'LLVMGCCDIR'}) {
|
||||||
$CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'};
|
$CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'};
|
||||||
$LLVMGCCPATH = $ENV{'LLVMGCCDIR'} . '/bin';
|
$LLVMGCCPATH = $ENV{'LLVMGCCDIR'} . '/bin';
|
||||||
@ -237,14 +231,15 @@ if ($CONFIGUREARGS !~ /--disable-jit/) {
|
|||||||
$CONFIGUREARGS .= " --enable-jit";
|
$CONFIGUREARGS .= " --enable-jit";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (@ARGV != 0 and @ARGV != 3 and $VERBOSE) {
|
if (@ARGV != 0 and @ARGV != 3) {
|
||||||
foreach $x (@ARGV) {
|
die "error: must specify 0 or 3 options!";
|
||||||
print "$x\n";
|
|
||||||
}
|
|
||||||
print "Must specify 0 or 3 options!";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (@ARGV == 3) {
|
if (@ARGV == 3) {
|
||||||
|
if ($CONFIG_PATH ne "") {
|
||||||
|
die "error: arguments are unsupported in -config mode,";
|
||||||
|
}
|
||||||
|
|
||||||
# ARGV[0] used to be the CVS root, ignored for backward compatibility.
|
# ARGV[0] used to be the CVS root, ignored for backward compatibility.
|
||||||
$BuildDir = $ARGV[1];
|
$BuildDir = $ARGV[1];
|
||||||
$WebDir = $ARGV[2];
|
$WebDir = $ARGV[2];
|
||||||
@ -264,6 +259,10 @@ if ($BUILDTYPE ne "release" && $BUILDTYPE ne "release-asserts") {
|
|||||||
$BUILDTYPE = "debug";
|
$BUILDTYPE = "debug";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($CONFIG_PATH ne "") {
|
||||||
|
die "error: -config mode is not yet implemented,";
|
||||||
|
}
|
||||||
|
|
||||||
##############################################################
|
##############################################################
|
||||||
#
|
#
|
||||||
# Define the file names we'll use
|
# Define the file names we'll use
|
||||||
|
Loading…
x
Reference in New Issue
Block a user