From a1c9ef3c831a473777985beb8d33d44d9350a858 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 16 Mar 2017 12:37:30 -0700
Subject: Remove INHIBIT_DEFAULT_DEPS

Depend on clang for build runtime libs
Build gobject-introspection for armv7 using gcc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/nonclangable.conf                       | 5 +++--
 recipes-devtools/clang/compiler-rt_git.bb    | 4 +---
 recipes-devtools/clang/libcxx_git.bb         | 4 +---
 recipes-devtools/clang/libcxxabi_git.bb      | 6 +++---
 recipes-devtools/clang/llvm-libunwind_git.bb | 3 ---
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index 1118ce7..1d42ae7 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -50,8 +50,9 @@ TOOLCHAIN_pn-tcp-wrappers = "gcc"
 TOOLCHAIN_pn-uclibc = "gcc"
 TOOLCHAIN_pn-uclibc-initial = "gcc"
 TOOLCHAIN_pn-valgrind = "gcc"
-# qemu-user does not execute the applications built with clang correctly
-# TOOLCHAIN_pn-gobject-introspection = "gcc"
+# qemu-user does not execute the applications built with clang correctly on armv7
+TOOLCHAIN_pn-gobject-introspection_armv7ve = "gcc"
+TOOLCHAIN_pn-gobject-introspection_armv7a = "gcc"
 
 #| ../../mpfr-3.1.4/src/mul.c:324:11: error: invalid output constraint '=h' in asm
 #|           umul_ppmm (tmp[1], tmp[0], MPFR_MANT (b)[0], MPFR_MANT (c)[0]);
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index e8da315..fa9f0ce 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -5,12 +5,10 @@ DESCRIPTION = "LLVM based C/C++ compiler Runtime"
 HOMEPAGE = "http://compiler-rt.llvm.org/"
 LICENSE = "MIT | NCSA"
 SECTION = "base"
-INHIBIT_DEFAULT_DEPS = "1"
 
 require clang.inc
 
-# libgcc gcc-runtime needed during configuring compiler-rt
-DEPENDS += "clang-cross-${TARGET_ARCH} virtual/${TARGET_PREFIX}libc-for-gcc libgcc gcc-runtime"
+TOOLCHAIN = "clang"
 
 PV .= "+git${SRCPV}"
 
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index f6f1444..9167181 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -5,9 +5,6 @@ DESCRIPTION = "libc++ is a new implementation of the C++ standard library, targe
 HOMEPAGE = "http://libcxx.llvm.org/"
 LICENSE = "MIT | NCSA"
 SECTION = "base"
-INHIBIT_DEFAULT_DEPS = "1"
-
-DEPENDS += "clang-cross-${TARGET_ARCH}"
 
 require clang.inc
 
@@ -43,3 +40,4 @@ EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=True "
 ALLOW_EMPTY_${PN} = "1"
 
 BBCLASSEXTEND = "native nativesdk"
+TOOLCHAIN = "clang"
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb
index 9d60425..86f1464 100644
--- a/recipes-devtools/clang/libcxxabi_git.bb
+++ b/recipes-devtools/clang/libcxxabi_git.bb
@@ -5,16 +5,16 @@ DESCRIPTION = "libc++ is a new implementation of the C++ standard library, targe
 HOMEPAGE = "http://libcxxabi.llvm.org/"
 LICENSE = "MIT | NCSA"
 SECTION = "base"
-INHIBIT_DEFAULT_DEPS = "1"
-
-DEPENDS += "clang-cross-${TARGET_ARCH}"
 
 require clang.inc
 
+TOOLCHAIN = "clang"
+
 inherit cmake
 PV .= "+git${SRCPV}"
 
 DEPENDS += "compiler-rt"
+
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8ae94dd6195890583eee15a988b6ea79; \
                    "
 SRC_URI = "\
diff --git a/recipes-devtools/clang/llvm-libunwind_git.bb b/recipes-devtools/clang/llvm-libunwind_git.bb
index a7c4e46..c421743 100644
--- a/recipes-devtools/clang/llvm-libunwind_git.bb
+++ b/recipes-devtools/clang/llvm-libunwind_git.bb
@@ -5,9 +5,6 @@ DESCRIPTION = "libunwind implements a stack unwinder, needed to perform C++ exce
 HOMEPAGE = "http://llvm.org/"
 LICENSE = "MIT | NCSA"
 SECTION = "base"
-INHIBIT_DEFAULT_DEPS = "1"
-
-DEPENDS += "clang-cross-${TARGET_ARCH}"
 
 require clang.inc
 
-- 
cgit v1.2.3-54-g00ecf