Merge branch 'master' into varfix

CMakeLists.txt

@@ -286,14 +286,6 @@ if (NOT CLAD_BUILD_STATIC_ONLY AND NOT LLVM_ENABLE_PLUGINS)
   message(FATAL_ERROR "LLVM_ENABLE_PLUGINS is set to OFF. Please build clad with -DCLAD_BUILD_STATIC_ONLY=ON.")
 endif()
 
-# Add clad deps if we build together with clang.
-if (TARGET intrinsics_gen)
-  list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen)
-endif()
-if (TARGET clang-headers)
-  list(APPEND LLVM_COMMON_DEPENDS clang-headers)
-endif()
-
 add_subdirectory(lib)
 add_subdirectory(tools)
 

lib/Differentiator/StmtClone.cpp

@@ -247,7 +247,7 @@ DEFINE_CLONE_EXPR(SubstNonTypeTemplateParmExpr,
                   (CloneType(Node->getType()), Node->getValueKind(),
                    Node->getBeginLoc(), Node->getReplacement(),
                    Node->getAssociatedDecl(), Node->getIndex(),
-                   Node->getPackIndex(), Node->isReferenceParameter()));
+                   Node->getPackIndex(), Node->isReferenceParameter()))
 #endif
 DEFINE_CREATE_EXPR(PseudoObjectExpr, (Ctx, Node->getSyntacticForm(), llvm::SmallVector<Expr*, 4>(Node->semantics_begin(), Node->semantics_end()), Node->getResultExprIndex()))
 // NOLINTEND(modernize-use-auto)

tools/CMakeLists.txt

@@ -132,6 +132,15 @@ if (NOT CLAD_BUILD_STATIC_ONLY)
     target_link_libraries(clad PUBLIC ${_enzyme_link_flags})
 
     add_dependencies(clad LLVMEnzyme)
+
+    # Add clad deps if we build together with clang.
+    if (TARGET intrinsics_gen)
+      add_dependencies(clad intrinsics_gen)
+    endif()
+    if (TARGET clang-headers)
+      add_dependencies(clad clang-headers)
+    endif()
+
   endif(CLAD_ENABLE_ENZYME_BACKEND)
 endif()
 set_source_files_properties(ClangPlugin.cpp PROPERTIES COMPILE_DEFINITIONS CLANG_MAJOR_VERSION="${LLVM_VERSION_MAJOR}")