diff options
author | 2017-08-01 07:15:56 -0700 | |
---|---|---|
committer | 2017-08-13 13:20:57 +0200 | |
commit | 8f65c719c77484da9a9bef5a6dbca5373bdcf680 (patch) | |
tree | f0ec9e8fba2c3bc2f184b0c32ed2b7e40c9138c3 /meta-initramfs/recipes-devtools | |
parent | 04c3bc04cda280ee7cf01e7c179157931af7a4f2 (diff) | |
download | meta-openembedded-contrib-8f65c719c77484da9a9bef5a6dbca5373bdcf680.tar.gz |
klibc: Fix build with clang
Remove gcc specific options use common one instead
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools')
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch | 30 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 5 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch new file mode 100644 index 0000000000..41cc14275e --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch @@ -0,0 +1,30 @@ +From f66edde8a704131d98e8783ea8d4c848e8119b20 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 26 Jul 2017 16:13:16 -0700 +Subject: [PATCH 1/3] Kbuild.klibc: Use -print-libgcc-file-name instead of + --print-libgcc + +-print-libgcc-file-name works with clang and gcc unlike --print-libgcc +which is gcc specific + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + scripts/Kbuild.klibc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc +index f500d535..101f86f5 100644 +--- a/scripts/Kbuild.klibc ++++ b/scripts/Kbuild.klibc +@@ -128,7 +128,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \ + KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS) + KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note + +-KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc) ++KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) -print-libgcc-file-name) + KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) + KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o + KLIBCLIBC := $(KLIBCOBJ)/libc.a +-- +2.13.3 + diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index cd3f39808d..45dc6baefd 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -17,6 +17,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ file://0001-include-linux-sysinfo.h-directly.patch \ file://0001-mkfifo-Implement-mkfifo.patch \ file://0001-always-use-bfd-linker.patch \ + file://0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch \ " ARMPATCHES ?= "" @@ -48,6 +49,10 @@ do_configure () { ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux } +do_configure_prepend_toolchain-clang() { + sed -i -e 's#$(KLIBCROSS)gcc#$(KLIBCROSS)clang#g' ${S}/Makefile +} + INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INSANE_SKIP_${PN} = "already-stripped" |