about summary refs log tree commit diff homepage
path: root/runtime
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-12-02 14:44:19 +0100
committerDan Liew <delcypher@gmail.com>2016-12-02 16:28:55 +0000
commit9293a3b584a8249ec8846e9200699e46e22a887c (patch)
tree53ec4e32024dd9fd46f31611f9497c89070c1f86 /runtime
parent74c6155ff3895e790d58689903b87308dfc05853 (diff)
downloadklee-9293a3b584a8249ec8846e9200699e46e22a887c.tar.gz
CMake: support LLVMCC.ExtraFlags
With the old buildsystem we could pass CFLAGS when building runtime
libs. Support passing some additional flags to cmake-based system too.

We need this to build 32 and 64bit runtime libs separately (but not
whole klee).

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'runtime')
-rw-r--r--runtime/Makefile.cmake.bitcode.config.in2
-rw-r--r--runtime/Makefile.cmake.bitcode.rules3
2 files changed, 3 insertions, 2 deletions
diff --git a/runtime/Makefile.cmake.bitcode.config.in b/runtime/Makefile.cmake.bitcode.config.in
index 9d31e907..c554265f 100644
--- a/runtime/Makefile.cmake.bitcode.config.in
+++ b/runtime/Makefile.cmake.bitcode.config.in
@@ -41,7 +41,7 @@ MKDIR := mkdir
 RM := rm
 
 # Compiler flags
-LLVMCC.Flags += \
+LLVMCC.Flags += $(LLVMCC.ExtraFlags) \
 	-I@CMAKE_SOURCE_DIR@/include \
 	-I@CMAKE_BINARY_DIR@/include \
 	-emit-llvm \
diff --git a/runtime/Makefile.cmake.bitcode.rules b/runtime/Makefile.cmake.bitcode.rules
index 85151e2f..27abde54 100644
--- a/runtime/Makefile.cmake.bitcode.rules
+++ b/runtime/Makefile.cmake.bitcode.rules
@@ -154,7 +154,8 @@ debug_vars:
 	@echo "IS_RELEASE := $(IS_RELEASE)"
 	@echo "LOCAL_BUILD_DIR := $(LOCAL_BUILD_DIR)"
 	@echo "LLVMCC := $(LLVMCC)"
-	@echo "LLVMCC.Flag := $(LLVMCC.Flags)"
+	@echo "LLVMCC.Flags := $(LLVMCC.Flags)"
+	@echo "LLVMCC.ExtraFlags := $(LLVMCC.ExtraFlags)"
 	@echo "LLVMCC.Warnings := $(LLVMCC.Warnings)"
 	@echo "MODULE_FILE := $(MODULE_FILE)"
 	@echo "ROOT_OBJ := $(ROOT_OBJ)"