From 39b89bbffe9e21bb2db5b2733b1f56610b6cdb45 Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier Date: Thu, 2 Mar 2023 13:02:43 +0100 Subject: android-tools: make native version compile Those 2 warnings (caused by the combination of -nostdlib and the options added by meta-clang) were treated as errors: """ clang-14: warning: argument unused during compilation: '-rtlib=libgcc' [-Wunused-command-line-argument] clang-14: warning: argument unused during compilation: '--unwindlib=libgcc' [-Wunused-command-line-argument] """ Signed-off-by: Etienne Cordonnier --- .../android-tools/android-tools/libunwind_mk_change_out_dir.patch | 2 +- dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'dynamic-layers') diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch index f560381..967c573 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch @@ -32,7 +32,7 @@ Upstream-Status: Pending LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \ -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ - -lpthread -nostdlib -lc -lgcc -Ldebian/out -l7z -+ -lpthread -nostdlib -lc -lgcc -l7z ++ -lpthread -nostdlib -lc -lgcc -l7z -Wno-error=unused-command-line-argument build: $(SOURCES) - mkdir --parents debian/out diff --git a/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb b/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb index db51f69..0d7a972 100644 --- a/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb +++ b/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb @@ -78,9 +78,11 @@ COMPATIBLE_HOST:powerpc64le = "(null)" inherit systemd clang TOOLCHAIN = "clang" -DEPENDS += "\ +TOOLCHAIN:class-native = "clang" +DEPENDS:append:class-target = "\ clang-cross-${TARGET_ARCH} \ " +DEPENDS:append:class-native = " clang-native" SYSTEMD_SERVICE:${PN} = "android-tools-adbd.service" -- cgit v1.2.3-54-g00ecf