fix cgo error

aws · May 28, 2024 · 07be449 · 07be449
1 parent 88cec51
commit 07be449
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -620,12 +620,12 @@ if(FIPS_SHARED)
       add_custom_command(
         TARGET crypto POST_BUILD
         COMMAND ${GO_EXECUTABLE} run
-        ${PROJECT_SOURCE_DIR}/util/fipstools/inject_hash/inject_hash.go
+        ${PROJECT_SOURCE_DIR}/util/fipstools/inject_hash/go/inject_hash.go
         -o $<TARGET_FILE:crypto> -in-object $<TARGET_FILE:crypto> ${INJECT_HASH_APPLE_FLAG}
         # The DEPENDS argument to a POST_BUILD rule appears to be ignored. Thus
         # go_executable isn't used (as it doesn't get built), but we list this
         # dependency anyway in case it starts working in some CMake version.
-        DEPENDS ../util/fipstools/inject_hash/inject_hash.go
+        DEPENDS ../util/fipstools/inject_hash/go/inject_hash.go
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
       )
     endif()

diff --git a/crypto/fipsmodule/CMakeLists.txt b/crypto/fipsmodule/CMakeLists.txt
@@ -404,7 +404,7 @@ if(FIPS_DELOCATE)
   set_target_properties(bcm_hashunset PROPERTIES LINKER_LANGUAGE C)
 
   go_executable(inject_hash
-                boringssl.googlesource.com/boringssl/util/fipstools/inject_hash)
+                boringssl.googlesource.com/boringssl/util/fipstools/inject_hash/go)
   add_custom_command(
     OUTPUT bcm.o
     COMMAND ./inject_hash -o bcm.o -in-archive $<TARGET_FILE:bcm_hashunset>

diff --git a/util/fipstools/inject_hash/inject_hash.go → util/fipstools/inject_hash/go/inject_hash.go b/util/fipstools/inject_hash/inject_hash.go → util/fipstools/inject_hash/go/inject_hash.go