[llvm] r211300 - Add option to keep flavor out of the install directory

[David Greene]

Author: greened
Date: Thu Jun 19 14:31:09 2014
New Revision: 211300

URL: http://llvm.org/viewvc/llvm-project?rev=211300&view=rev
Log:
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.

Modified:
    llvm/trunk/utils/llvm-compilers-check

Modified: llvm/trunk/utils/llvm-compilers-check
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-compilers-check?rev=211300&r1=211299&r2=211300&view=diff
==============================================================================
--- llvm/trunk/utils/llvm-compilers-check (original)
+++ llvm/trunk/utils/llvm-compilers-check Thu Jun 19 14:31:09 2014
@@ -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)