diff options
| -rw-r--r-- | meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch b/meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch deleted file mode 100644 index c598a0d6f7..0000000000 --- a/meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From 0ef3d75514ee5a74b7c04ea36423cff97843fbb8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 10 May 2016 01:07:24 -0700 | ||
| 4 | Subject: [PATCH] gcc-runtime: Symlink c++ header in target_triplet for SDK use | ||
| 5 | |||
| 6 | We build SDKs such that gcc-cross-candian is built for only one | ||
| 7 | target *-*-linux and then use -muclibc or -mmusl to let it compile | ||
| 8 | code for other libc variants. This works fine when libc = glibc | ||
| 9 | however it does not work for c++ programs when libc != glibc since | ||
| 10 | there are c++ headers installed under ${includedir}/c++/${BINV}/${TARGET_SYS} | ||
| 11 | which is fine when gcc-runtime and gcc-cross-candian uses same --target options | ||
| 12 | gxx includedir searches in right triplet, but it fails with musl/uclibc | ||
| 13 | since gcc will look for glibc based triplet but gcc-runtime will install | ||
| 14 | them under musl/uclibc triplet. | ||
| 15 | |||
| 16 | This patch symlinks the musl/uclibc triplet to glibc triplet when libc != glibc | ||
| 17 | |||
| 18 | This fixes SDKs for musl/uclibc | ||
| 19 | |||
| 20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 21 | --- | ||
| 22 | meta/recipes-devtools/gcc/gcc-runtime.inc | 6 ++++-- | ||
| 23 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
| 24 | |||
| 25 | diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc | ||
| 26 | index 8639c1c..8e4d5eb 100644 | ||
| 27 | --- a/meta/recipes-devtools/gcc/gcc-runtime.inc | ||
| 28 | +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc | ||
| 29 | @@ -70,13 +70,15 @@ do_install () { | ||
| 30 | if [ -d ${D}${infodir} ]; then | ||
| 31 | rmdir --ignore-fail-on-non-empty -p ${D}${infodir} | ||
| 32 | fi | ||
| 33 | +} | ||
| 34 | + | ||
| 35 | +do_install_append_class-target () { | ||
| 36 | if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then | ||
| 37 | ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS} | ||
| 38 | fi | ||
| 39 | - if [ "${TARGET_OS}" = "linux-gnuspe" ]; then | ||
| 40 | + if [ "${TARGET_OS}" = "linux-gnuspe" -o "${TCLIBC}" != "glibc" ]; then | ||
| 41 | ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux | ||
| 42 | fi | ||
| 43 | - chown -R root:root ${D} | ||
| 44 | } | ||
| 45 | |||
| 46 | INHIBIT_DEFAULT_DEPS = "1" | ||
| 47 | -- | ||
| 48 | 2.8.2 | ||
| 49 | |||
