From e8d3e337ec87a00c321b1aedc99e808ab881edcc Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Mon, 7 Jun 2021 22:23:52 +0200
Subject: [PATCH] fix code gen dependencies

---
 cmake/CodeGen.cmake | 25 ++++++++++++++++---------
 dbt-core            |  2 +-
 tgfs                |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/cmake/CodeGen.cmake b/cmake/CodeGen.cmake
index b2cc4e1..7dac354 100644
--- a/cmake/CodeGen.cmake
+++ b/cmake/CodeGen.cmake
@@ -73,18 +73,25 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
     		list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp")
     		list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/${BACKEND}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp")
     		set(${CORE_NAME}_OUTPUT_FILES ${DBT_CORE_TGC_DIR}/incl/iss/arch/${CORE_NAMEL}.h ${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp ${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp)
-    		add_custom_command(
-    		    COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
-    		    DEPENDS ${GENERATOR_JAR} ${INPUT_FILE} ${TMPL_DIR}/CORENAME.h.gtl ${TMPL_DIR}/CORENAME.cpp.gtl ${TMPL_DIR}/${BACKEND}/CORENAME.cpp.gtl
-    		    OUTPUT ${${CORE_NAME}_OUTPUT_FILES}
-    		    COMMENT "Generating code for ${CORE_NAME}."
-    		    USES_TERMINAL VERBATIM
-    		)    		
-    		add_custom_target(${CORE_NAME}_src DEPENDS ${${CORE_NAME}_OUTPUT_FILES})
+    		#add_custom_command(
+    		#    COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
+    		#    DEPENDS ${GENERATOR_JAR} ${INPUT_FILE} ${TMPL_DIR}/CORENAME.h.gtl ${TMPL_DIR}/CORENAME.cpp.gtl ${TMPL_DIR}/${BACKEND}/CORENAME.cpp.gtl
+    		#    OUTPUT ${${CORE_NAME}_OUTPUT_FILES}
+    		#    COMMENT "Generating code for ${CORE_NAME}."
+    		#    USES_TERMINAL VERBATIM
+    		#)    		
+    		#add_custom_target(${CORE_NAME}_cpp DEPENDS ${${CORE_NAME}_OUTPUT_FILES})
+    		add_custom_target(${CORE_NAME}_cpp
+                COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+                COMMENT "Generating ISS sources"
+                BYPRODUCTS ${${CORE_NAME}_OUTPUT_FILES}
+                USES_TERMINAL
+            )
     	endmacro()
 else()
 	macro(gen_coredsl CORE_NAME INPUT_FILE BACKEND)
-		add_custom_target(${CORE_NAME}_src)
+		add_custom_target(${CORE_NAME}_cpp)
         message(STATUS "Not adding generation steps for ${CORE_NAME}(${ENABLE_CODEGEN}, ${GENERATOR_JAR})")
 	endmacro()
 endif()
diff --git a/dbt-core b/dbt-core
index 50104a5..246b92c 160000
--- a/dbt-core
+++ b/dbt-core
@@ -1 +1 @@
-Subproject commit 50104a5cc282d66313d19958ca3a76f39082f514
+Subproject commit 246b92cc5ddd33c98263b3ec0771745912826f6c
diff --git a/tgfs b/tgfs
index 8c38564..e432dd8 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit 8c385647dde5821029f33173f3c8a3aa062d4810
+Subproject commit e432dd820815fce7215b52665234f127c9351fc9