mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-03 09:21:02 +00:00
Add a new -compileflags options, remove old externals location specifiers.
People should just use -with-externals. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28756 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
a3bb86dd6b
commit
f6dc20fcc0
@ -17,9 +17,6 @@
|
||||
# -norunningtests.
|
||||
# -norunningtests Do not run the Olden benchmark suite with
|
||||
# LARGE_PROBLEM_SIZE enabled.
|
||||
# -noexternals Do not run the external tests (for cases where povray
|
||||
# or SPEC are not installed)
|
||||
# -with-externals Specify a directory where the external tests are located.
|
||||
# -nodejagnu Do not run feature or regression tests
|
||||
# -parallel Run two parallel jobs with GNU Make.
|
||||
# -release Build an LLVM Release version
|
||||
@ -43,14 +40,15 @@
|
||||
# override the default.
|
||||
# -ldflags Next argument specifies that linker options that override
|
||||
# the default.
|
||||
# -extraflags Next argument specifies extra options that are passed to
|
||||
# compile the tests.
|
||||
# -compileflags Next argument specifies extra options passed to make when
|
||||
# building LLVM.
|
||||
#
|
||||
# ---------------- Options to configure llvm-test ----------------------------
|
||||
# -spec2000path Path to the benchspec directory in the SPEC 2000 distro
|
||||
# -spec95path Path to the benchspec directory in the SPEC 95 distro.
|
||||
# -povraypath Path to the povray sources
|
||||
# -namdpath Path to the namd sources
|
||||
# -extraflags Next argument specifies extra options that are passed to
|
||||
# compile the tests.
|
||||
# -noexternals Do not run the external tests (for cases where povray
|
||||
# or SPEC are not installed)
|
||||
# -with-externals Specify a directory where the external tests are located.
|
||||
#
|
||||
# CVSROOT is the CVS repository from which the tree will be checked out,
|
||||
# specified either in the full :method:user@host:/dir syntax, or
|
||||
@ -100,8 +98,6 @@ my $CVSCOOPT = "-APR";
|
||||
my $NICE = "";
|
||||
my $NODEJAGNU = 0;
|
||||
|
||||
my $LLVMTESTCONFIGARGS = "";
|
||||
|
||||
sub ReadFile {
|
||||
if (open (FILE, $_[0])) {
|
||||
undef $/;
|
||||
@ -334,23 +330,14 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
|
||||
if (/^-ldflags/) {
|
||||
$MAKEOPTS = "$MAKEOPTS LD.Flags=\'$ARGV[0]\'"; shift; next;
|
||||
}
|
||||
if (/^-extraflags/) {
|
||||
if (/^-compileflags/) {
|
||||
$MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next;
|
||||
}
|
||||
if (/^-extraflags/) {
|
||||
$PROGTESTOPTS .= " EXTRA_FLAGS=\'$ARGV[0]\'"; shift; next;
|
||||
}
|
||||
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
|
||||
if (/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
|
||||
if (/^-spec2000path$/) {
|
||||
$LLVMTESTCONFIGARGS .= " --enable-spec2000=$ARGV[0]"; shift; next;
|
||||
}
|
||||
if (/^-spec95path$/) {
|
||||
$LLVMTESTCONFIGARGS .= " --enable-spec95=$ARGV[0]"; shift; next;
|
||||
}
|
||||
if (/^-povraypath$/) {
|
||||
$LLVMTESTCONFIGARGS .= " --enable-povray=$ARGV[0]"; shift; next;
|
||||
}
|
||||
if (/^-namdpath$/) {
|
||||
$LLVMTESTCONFIGARGS .= " --enable-namd=$ARGV[0]"; shift; next;
|
||||
}
|
||||
print "Unknown option: $_ : ignoring!\n";
|
||||
}
|
||||
|
||||
@ -462,7 +449,7 @@ $LOC = `utils/countloc.sh`;
|
||||
#
|
||||
if (!$NOCHECKOUT) {
|
||||
if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; }
|
||||
my $EXTRAFLAGS = "--enable-spec --with-objroot=.$LLVMTESTCONFIGARGS";
|
||||
my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
|
||||
system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog 2>&1";
|
||||
|
||||
if ( $VERBOSE ) { print "BUILD STAGE\n"; }
|
||||
|
Loading…
Reference in New Issue
Block a user