diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2018-06-21 12:50:36 +0200 |
|---|---|---|
| committer | Koen Kooi <koen.kooi@linaro.org> | 2018-06-21 12:51:09 +0200 |
| commit | a9e70e6e285c44b17a09c6fd1af7532292b4e8ee (patch) | |
| tree | be0d08a2cf45ada42e619e8fe385c2e988904963 /meta-linaro-toolchain | |
| parent | b546dd83664679a88a7c7af6d329fd6b3487a110 (diff) | |
gcc-cross.inc: sync with OE-core
Change-Id: I0f12b9b3d94201da54e5b8daddbc7bb4cc43940d
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Diffstat (limited to 'meta-linaro-toolchain')
| -rw-r--r-- | meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc index a6df45e3..ab15e5e3 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc @@ -35,6 +35,7 @@ EXTRA_OECONF += "\ DEPENDS_remove_libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc" EXTRA_OECONF_append_libc-baremetal = " --without-headers" EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" +EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \ @@ -161,17 +162,19 @@ do_install () { install -d ${D}${target_base_libdir} install -d ${D}${target_libdir} - + # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77 # gfortran is fully backwards compatible. This is a safe and practical solution. - ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true + if [ -n "${@d.getVar('FORTRAN')}" ]; then + ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true + fortsymlinks="g77 gfortran" + fi - # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are # found. These need to be relative paths so they work in different locations. dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ install -d $dest - for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do + for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip gcc cpp $fortsymlinks; do ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t done |