summaryrefslogtreecommitdiff
path: root/mk/llvm
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-03-08 23:45:30 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-03-08 23:45:30 +0100
commitda61f09b974a605d3914e18a43eb3fa6c8dfe0aa (patch)
tree85a4244f2d15c7895e177c6e26f7c3a68cd9c7d8 /mk/llvm
parent6eb054f2da5a30c0627b8a4c6682e332f56c4015 (diff)
downloadembtoolkit-da61f09b974a605d3914e18a43eb3fa6c8dfe0aa.tar.gz
embtoolkit-da61f09b974a605d3914e18a43eb3fa6c8dfe0aa.tar.bz2
embtoolkit-da61f09b974a605d3914e18a43eb3fa6c8dfe0aa.tar.xz
Toolchain: llvm/compiler-rt: install asan and ubsan linker script
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk/llvm')
-rw-r--r--mk/llvm/compiler-rt/compiler-rt.mk9
-rw-r--r--mk/llvm/llvm.mk2
2 files changed, 10 insertions, 1 deletions
diff --git a/mk/llvm/compiler-rt/compiler-rt.mk b/mk/llvm/compiler-rt/compiler-rt.mk
index 2e527a5..4f29e67 100644
--- a/mk/llvm/compiler-rt/compiler-rt.mk
+++ b/mk/llvm/compiler-rt/compiler-rt.mk
@@ -45,6 +45,15 @@ define embtk_beforeinstall_compiler-rt
$(COMPILER-RT_BUILD_DIR)/Makefile
endef
+__embtk_libasan := libclang_rt.asan-$(__embtk_clang_arch).a
+__embtk_libubsan := libclang_rt.ubsan-$(__embtk_clang_arch).a
+define embtk_postinstall_compiler-rt
+ echo "GROUP(libasan.a libsanitizer_common.a)" \
+ > $(__embtk_clang_libdir)/$(__embtk_libasan)
+ echo "GROUP(libubsan.a libsanitizer_common.a)" \
+ > $(__embtk_clang_libdir)/$(__embtk_libubsan)
+endef
+
define embtk_cleanup_compiler-rt
if [ -e $(LIBCXXRT_BUILD_DIR)/Makefile ]; then \
$(MAKE) -C $(COMPILER-RT_BUILD_DIR) clean; \
diff --git a/mk/llvm/llvm.mk b/mk/llvm/llvm.mk
index 3ec7225..e35138a 100644
--- a/mk/llvm/llvm.mk
+++ b/mk/llvm/llvm.mk
@@ -52,7 +52,7 @@ LLVM_PREFIX := $(embtk_tools)
__embtk_clang_arch := $(firstword $(subst -, ,$(STRICT_GNU_TARGET)))
__embtk_clang_rversion = $(shell ls $(embtk_tools)/lib/clang/)
-embtk_clang_libdir = $(embtk_tools)/lib/clang/$(__embtk_clang_rversion)/lib/linux
+__embtk_clang_libdir = $(embtk_tools)/lib/clang/$(__embtk_clang_rversion)/lib/linux
define embtk_install_llvm
$(call __embtk_install_hostpkg,llvm)