From 30db0c28dee5c8dc8b4bfeb2a94a22ceaba7aec9 Mon Sep 17 00:00:00 2001 From: David Greene Date: Thu, 19 Jun 2014 19:31:09 +0000 Subject: [PATCH] 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 --- utils/llvm-compilers-check | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)