build: Fix known-good MoltenVK building
authorJeremy Kniager <jeremyk@lunarg.com>
Tue, 3 Sep 2019 19:38:52 +0000 (13:38 -0600)
committerjeremyk-lunarg <jeremyk@lunarg.com>
Wed, 4 Sep 2019 17:00:34 +0000 (11:00 -0600)
MoltenVK seems to have trouble building on the
current version of Vulkan-Headers.

Since Vulkan-Headers doesn't take very long to build and
changes often, this fix removes the reuse of the
Vulkan-Headers repo, whose version is provided by Vulkan-Tools
known-good.json, in the MoltenVK build.

It instead uses the version of Vulkan-Headers provided by
the MoltenVK known-good when building MoltenVK.

**Note:** Vulkan-Tools and other required repos are still
built with the version of Vulkan-Headers provided by
Vulkan-Tools known-good.json.

Change-Id: I1b11122cf0c6ba488acd53a35e4755f00e48376c

scripts/known_good.json

index 7adfa72..dcacc86 100644 (file)
@@ -27,7 +27,7 @@
       "install_dir" : "MoltenVK",
       "commit" : "v1.0.36",
       "custom_build" : [
-        "./fetchDependencies --v-headers-root {0[Vulkan-Headers][repo_dir]} --glslang-root {0[glslang][repo_dir]}",
+        "./fetchDependencies --glslang-root {0[glslang][repo_dir]}",
         "xcodebuild -project MoltenVKPackaging.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS MVK_CONFIG_LOG_LEVEL=1' -scheme \"MoltenVK Package\" build"
       ],
       "build_step" : "custom",