projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
R600/SI: Fix VOP2 VI encoding
[oota-llvm.git]
/
utils
/
llvm-compilers-check
diff --git
a/utils/llvm-compilers-check
b/utils/llvm-compilers-check
index 3173027759b73ff4ea6b3f3a21d9d83eb3cf71b1..4db8426ace88e1632a4aa4906615de04109f964b 100755
(executable)
--- a/
utils/llvm-compilers-check
+++ b/
utils/llvm-compilers-check
@@
-149,6
+149,10
@@
def add_options(parser):
help=("Do not do installs"))
parser.add_option("--keep-going", default=False, action="store_true",
help=("Keep going after failures"))
help=("Do not do installs"))
parser.add_option("--keep-going", default=False, action="store_true",
help=("Keep going after failures"))
+ parser.add_option("--no-flavor-prefix", default=False, action="store_true",
+ help=("Do not append the build flavor to the install path"))
+ parser.add_option("--enable-werror", default=False, action="store_true",
+ help=("Build with -Werror"))
return
def check_options(parser, options, valid_builds):
return
def check_options(parser, options, valid_builds):
@@
-346,7
+350,9
@@
class Builder(threading.Thread):
ssabbrev = get_short_abbrevs([ab for ab in self.source_abbrev.values()])
prefix = "[" + ssabbrev[self.source_abbrev[source]] + "-" + self.build_abbrev[build] + "]"
ssabbrev = get_short_abbrevs([ab for ab in self.source_abbrev.values()])
prefix = "[" + ssabbrev[self.source_abbrev[source]] + "-" + self.build_abbrev[build] + "]"
- self.install_prefix += "/" + self.source_abbrev[source] + "/" + build
+ if (not self.options.no_flavor_prefix):
+ self.install_prefix += "/" + self.source_abbrev[source] + "/" + build
+
build_suffix += "/" + self.source_abbrev[source] + "/" + build
self.logger = logging.getLogger(prefix)
build_suffix += "/" + self.source_abbrev[source] + "/" + build
self.logger = logging.getLogger(prefix)
@@
-361,16
+367,13
@@
class Builder(threading.Thread):
configure_flags = dict(
llvm=dict(debug=["--prefix=" + self.install_prefix,
configure_flags = dict(
llvm=dict(debug=["--prefix=" + self.install_prefix,
- "--enable-werror",
"--enable-assertions",
"--disable-optimized",
"--with-gcc-toolchain=" + cxxroot],
release=["--prefix=" + self.install_prefix,
"--enable-assertions",
"--disable-optimized",
"--with-gcc-toolchain=" + cxxroot],
release=["--prefix=" + self.install_prefix,
- "--enable-werror",
"--enable-optimized",
"--with-gcc-toolchain=" + cxxroot],
paranoid=["--prefix=" + self.install_prefix,
"--enable-optimized",
"--with-gcc-toolchain=" + cxxroot],
paranoid=["--prefix=" + self.install_prefix,
- "--enable-werror",
"--enable-assertions",
"--enable-expensive-checks",
"--disable-optimized",
"--enable-assertions",
"--enable-expensive-checks",
"--disable-optimized",
@@
-379,6
+382,11
@@
class Builder(threading.Thread):
release=[],
paranoid=[]))
release=[],
paranoid=[]))
+ if (self.options.enable_werror):
+ configure_flags["llvm"]["debug"].append("--enable-werror")
+ configure_flags["llvm"]["release"].append("--enable-werror")
+ configure_flags["llvm"]["paranoid"].append("--enable-werror")
+
configure_env = dict(
llvm=dict(debug=dict(CC=self.cc,
CXX=self.cxx),
configure_env = dict(
llvm=dict(debug=dict(CC=self.cc,
CXX=self.cxx),
@@
-530,10
+538,6
@@
class Builder(threading.Thread):
self.logger.info("[" + prefix + "] Configure failed, no configure script " + conf)
return -1
self.logger.info("[" + prefix + "] Configure failed, no configure script " + conf)
return -1
- if not os.path.exists(mf):
- self.logger.info("[" + prefix + "] Configure failed, no makefile " + mf)
- return -1
-
if os.path.exists(conf) and os.path.exists(mf):
confstat = os.stat(conf)
makestat = os.stat(mf)
if os.path.exists(conf) and os.path.exists(mf):
confstat = os.stat(conf)
makestat = os.stat(mf)