summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorDavid Greene <greened@obbligato.org>2014-06-19 19:31:09 +0000
committerDavid Greene <greened@obbligato.org>2014-06-19 19:31:09 +0000
commit30db0c28dee5c8dc8b4bfeb2a94a22ceaba7aec9 (patch)
tree41712a30b52ac5271f611fe0952b7b4bca18aea8 /utils
parent5b45c5d7ec51ef019a8133c7e27251ce3c9f0bbd (diff)
Add option to keep flavor out of the install directory
Sometimes we want to install things in "standard" locations and the flavor directories interfere with that. Add an option to keep them out of the install path. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211300 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rwxr-xr-xutils/llvm-compilers-check6
1 files changed, 5 insertions, 1 deletions
diff --git a/utils/llvm-compilers-check b/utils/llvm-compilers-check
index d745b3a7c50..c8bd905ff9c 100755
--- a/utils/llvm-compilers-check
+++ b/utils/llvm-compilers-check
@@ -149,6 +149,8 @@ def add_options(parser):
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
@@ -348,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] + "]"
- 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)