[zorg] r368376 - [monorepo] Move generator to the end of the CMake invocation

[Jonas Devlieghere via llvm-commits]

Author: jdevlieghere
Date: Thu Aug  8 18:08:42 2019
New Revision: 368376

URL: http://llvm.org/viewvc/llvm-project?rev=368376&view=rev
Log:
[monorepo] Move generator to the end of the CMake invocation

I really think this is showcasing a serious issue with the Xcode
generated project, but moving the generator to the end seems to work.

Modified:
    zorg/trunk/zorg/jenkins/monorepo_build.py

Modified: zorg/trunk/zorg/jenkins/monorepo_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/monorepo_build.py?rev=368376&r1=368375&r2=368376&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/monorepo_build.py (original)
+++ zorg/trunk/zorg/jenkins/monorepo_build.py Thu Aug  8 18:08:42 2019
@@ -609,13 +609,13 @@ def lldb_cmake_xcode_builder(target):
 
     cmake_cmd = ['/usr/local/bin/cmake',
                  '-C', xcode_cache,
-		 '-G', 'Xcode',
                  '-L', conf.lldbsrcdir(),
                  '-DLLVM_ENABLE_ASSERTIONS:BOOL={}'.format("TRUE" if conf.assertions else "FALSE"),
                  '-DLLVM_ENABLE_MODULES=Off',
                  '-DLLVM_DIR={}'.format(llvm_dir),
                  '-DClang_DIR={}'.format(clang_dir),
-                 '-DLLVM_VERSION_PATCH=99']
+                 '-DLLVM_VERSION_PATCH=99',
+		 '-G', 'Xcode']
     cmake_cmd.extend(conf.cmake_flags)
 
     build_cmd = ['/usr/local/bin/cmake',