[zorg] r324918 - Do not set clang-related config parameters if clang does not get built

Galina Kistanova via llvm-commits llvm-commits at lists.llvm.org
Mon Feb 12 10:03:32 PST 2018


Author: gkistanova
Date: Mon Feb 12 10:03:32 2018
New Revision: 324918

URL: http://llvm.org/viewvc/llvm-project?rev=324918&view=rev
Log:
Do not set clang-related config parameters if clang does not get built

Modified:
    zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py?rev=324918&r1=324917&r2=324918&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py Mon Feb 12 10:03:32 2018
@@ -391,12 +391,16 @@ def getCmakeWithNinjaMultistageBuildFact
     # Set proper defaults.
     CmakeCommand.applyDefaultOptions(cmake_args, [
         ('-DCMAKE_BUILD_TYPE=',        'Release'),
-        ('-DCLANG_BUILD_EXAMPLES=',    'OFF'),
         ('-DLLVM_BUILD_TESTS=',        'ON'),
         ('-DLLVM_ENABLE_ASSERTIONS=',  'OFF'),
         ('-DLLVM_OPTIMIZED_TABLEGEN=', 'ON'),
         ])
 
+    if 'clang' in depends_on_projects:
+        CmakeCommand.applyDefaultOptions(cmake_args, [
+            ('-DCLANG_BUILD_EXAMPLES=',    'OFF'),
+            ])
+
     # Some options are required for this build no matter what.
     CmakeCommand.applyRequiredOptions(cmake_args, [
         ('-G',                         'Ninja'),




More information about the llvm-commits mailing list