From da9df5ff07941351f14b2d406ffcf61b166d2cb5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 16 Mar 2017 09:10:54 -0700 Subject: clang/compiler-rt: Use compiler-rt and libcxx as default runtime for target clang One can still use -stdlib=libstdc++ and -rtlib=libgcc to use gcc runtime Signed-off-by: Khem Raj --- recipes-devtools/clang/clang_git.bb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'recipes-devtools/clang/clang_git.bb') diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index cc0d45e..29e2e8f 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb @@ -15,14 +15,21 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=${LLVMMD5SUM}; \ " SRC_URI = "${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ ${LLVM_GIT}/clang.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};destsuffix=git/tools/clang;name=clang \ + " + +# llvm patches +SRC_URI += "\ file://0001-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch \ file://0002-llvm-Do-not-assume-linux-glibc.patch \ file://0003-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ - \ + " + +# Clang patches +SRC_URI += "\ file://0001-clang-driver-Use-lib-for-ldso-on-OE.patch;patchdir=tools/clang \ file://0002-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch;patchdir=tools/clang \ file://0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch;patchdir=tools/clang \ - file://0004-clang-Do-not-search-clang-install-dir-relative-.-lib.patch;patchdir=tools/clang \ + file://0004-clang-Prepend-trailing-to-sysroot.patch;patchdir=tools/clang \ " SRCREV_FORMAT = "llvm_clang" @@ -57,6 +64,12 @@ def get_clang_target_arch(bb, d): #TUNE_CCARGS_append_class-target = " -D__extern_always_inline=inline -I${PKG_CONFIG_SYSROOT_DIR}${includedir}/libxml2 " #LDFLAGS_append_class-target = " -L${PKG_CONFIG_SYSROOT_DIR}${libdir}/libxml2 " +PACKAGECONFIG ??= "compiler-rt libcplusplus" +PACKAGECONFIG_class-native = "" + +PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,,compiler-rt" +PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,,libcxx" + EXTRA_OECMAKE="-DLLVM_ENABLE_RTTI=True \ -DLLVM_ENABLE_FFI=False \ -DCMAKE_SYSTEM_NAME=Linux \ -- cgit v1.2.3-54-g00ecf