diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:15 +0200 |
| commit | 47d4f7609270e81344abb78fa3658e917a9e9b8f (patch) | |
| tree | 8fe021264f475abbab529b26e54bfe1c4892c0c7 /Makefile | |
| parent | 555e0db0fa05432c36f9d4a0b9cbcaf7498ac238 (diff) | |
| parent | 932ef7a02e2fff7fd7d6ee1cb3558593987c5b3e (diff) | |
| download | barebox-47d4f7609270e81344abb78fa3658e917a9e9b8f.tar.gz barebox-47d4f7609270e81344abb78fa3658e917a9e9b8f.tar.xz | |
Merge branch 'for-next/kasan' into master
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -448,6 +448,7 @@ export LDFLAGS_barebox export LDFLAGS_pbl export CFLAGS_UBSAN +export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE # Files to ignore in find ... statements @@ -636,7 +637,10 @@ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) # change __FILE__ to the relative path from the srctree KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) -include $(srctree)/scripts/Makefile.ubsan +include-y +=scripts/Makefile.ubsan +include-$(CONFIG_KASAN) += scripts/Makefile.kasan + +include $(addprefix $(srctree)/, $(include-y)) # KBUILD_IMAGE: Default barebox image to build # Depending on the architecture, this can be either compressed or not. |