From 9835692a976c3c17847d08bf74937ad8188b694b Mon Sep 17 00:00:00 2001 From: Jeremy Kniager Date: Tue, 3 Sep 2019 13:38:52 -0600 Subject: build: Fix known-good MoltenVK building 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/known_good.json b/scripts/known_good.json index 7adfa728..dcacc861 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -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", -- cgit v1.2.3