summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortgrogers <[email protected]>2017-05-16 16:56:54 -0400
committertgrogers <[email protected]>2017-05-17 09:53:03 -0400
commit8b44f564221b9a0503ca04ccdb463bd60ae8c33c (patch)
tree8653aeee6c56b2fc666f267013845724a3e54799
parent196703487e33ec383dab2a0cededb2289e342083 (diff)
Fixing a bug with where the build version is made. Moveing it after the right directories ect are defined
-rw-r--r--Makefile3
-rw-r--r--version_detection.mk1
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 78ef892..7a7b187 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,9 @@ ifneq ($(shell which nvcc), "")
endif
endif
+
+$(shell mkdir -p $(SIM_OBJ_FILES_DIR)/libcuda && echo "const char *g_gpgpusim_build_string=\"$(GPGPUSIM_BUILD)\";" > $(SIM_OBJ_FILES_DIR)/detailed_version)
+
LIBS = cuda-sim gpgpu-sim_uarch $(INTERSIM) gpgpusimlib
diff --git a/version_detection.mk b/version_detection.mk
index 00a8b1f..f9c333f 100644
--- a/version_detection.mk
+++ b/version_detection.mk
@@ -36,7 +36,6 @@ GIT_BRANCH := $(shell git branch | grep "\*" | sed -re 's/\*\s+(.*)/\1/')
GIT_COMMIT := $(shell git log -n 1 | head -1 | sed -re 's/commit (.*)/\1/')
GIT_FILES_CHANGED := $(shell git diff --numstat --cached && git diff --numstat | wc | sed -re 's/^\s+([0-9]+).*/\1/')
GPGPUSIM_BUILD := "gpgpu-sim_$(GIT_BRANCH)_$(GIT_COMMIT)_modified_$(GIT_FILES_CHANGED)"
-$(shell mkdir -p $(SIM_OBJ_FILES_DIR)/libcuda && echo "const char *g_gpgpusim_build_string=\"$(GPGPUSIM_BUILD)\";" > $(SIM_OBJ_FILES_DIR)/detailed_version)
endif
# Detect CUDA Runtime Version