Bazel more bundle include fixes (#1854)

EnzymeAD · Apr 28, 2024 · 11f5f09 · 11f5f09
1 parent 935c19c
commit 11f5f09
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/enzyme/BUILD b/enzyme/BUILD
@@ -206,8 +206,10 @@ genrule(
     name = "bundled-includes",
     srcs = glob(["include/**"]) + ["scripts/bundle-includes.sh"],
     outs = ["bundled_includes.h"],
-    cmd = "$(location :scripts/bundle-includes.sh) ./include $@",
+    cmd = "$(location :scripts/bundle-includes.sh) $(location :include/enzyme/enzyme) $@"
 )
+
+
 genrule(
     name = "gen_enzyme-clang++",
     srcs = [":enzyme-clang"],

diff --git a/enzyme/CMakeLists.txt b/enzyme/CMakeLists.txt
@@ -310,7 +310,7 @@ set(bundled_includes "${CMAKE_CURRENT_BINARY_DIR}/Enzyme/Clang/bundled_includes.
 list(APPEND ENZYME_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/bundle-includes.sh)
 add_custom_command(OUTPUT ${bundled_includes}
   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/bundle-includes.sh
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/enzyme/enzyme
   ${bundled_includes}
   DEPENDS ${ENZYME_INCLUDES}
   COMMENT "Bundling includes"

diff --git a/enzyme/scripts/bundle-includes.sh b/enzyme/scripts/bundle-includes.sh
@@ -2,9 +2,11 @@
 
 set -e
 
-INPUT_DIR=$1
+INPUT_DIR=$(dirname $1)/..
 OUTPUT_FILE=$2
 
+echo $INPUT_FILE
+echo $OUTPUT_FILE
 mkdir -p "$(dirname "$OUTPUT_FILE")"
 
 echo > "$OUTPUT_FILE"