From 465df13196c674ebe60eaf30efc6220c88e30457 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 3 Nov 2022 15:09:03 +0000 Subject: [PATCH] Revert "This CL updates the cmake files to use go run directly." This reverts commit a950d4539ed6e6846616804b2b986f79460bc484. Reason for revert: Ran into issues integrating into all the required build environments. Original change's description: > This CL updates the cmake files to use go run directly. > > Instead of using the tools/run script this CL updates CMake > to directly invoke go run. This should work around issues > with multiple writers of the gen binary and fixup windows issues. > > Change-Id: Ie27f45a1d132e9ec100cad709bb92da8558b4fb3 > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/108045 > Reviewed-by: Ben Clayton > Kokoro: Kokoro > Commit-Queue: Dan Sinclair TBR=dsinclair@chromium.org,bclayton@google.com,noreply+kokoro@google.com,dawn-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I10e7796d4f11661f2055c08202c84e56355ec397 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/108420 Kokoro: Kokoro Reviewed-by: Ben Clayton Commit-Queue: Dan Sinclair --- src/tint/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt index bd5e824658..eaf5c65029 100644 --- a/src/tint/CMakeLists.txt +++ b/src/tint/CMakeLists.txt @@ -510,9 +510,8 @@ function(tint_generate TARGET) ${PROJECT_SOURCE_DIR}/src/tint/intrinsics.def ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}.tmpl ) - set(GEN_CMD ${PROJECT_SOURCE_DIR}/tools/golang/bin/go run ./tools/src/cmd/gen) add_custom_command( - COMMAND ${GEN_CMD} -o ${DAWN_BUILD_GEN_DIR} ${PROJECT_SOURCE_DIR}/src/tint/${TARGET}.tmpl + COMMAND ./tools/run gen -o ${DAWN_BUILD_GEN_DIR} ${PROJECT_SOURCE_DIR}/src/tint/${TARGET}.tmpl DEPENDS ${IN} OUTPUT ${DAWN_BUILD_GEN_DIR}/src/tint/${TARGET} COMMENT "Tint: Generating files for ${TARGET}"