diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2013-12-05 00:49:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 14:25:23 +0000 |
commit | cae2315266b704614fe1d7bdeef004ef67a01e8d (patch) | |
tree | d39be7fa92c09d56322177d2e8f385c98453ecce /meta | |
parent | 5bde5d9b39ea67f19a1a6aedd0c08c6cfedcbe5f (diff) | |
download | poky-cae2315266b704614fe1d7bdeef004ef67a01e8d.tar.gz |
bitbake.conf/native.bbclass: Use FC instead of F77 for fortran
gcc tooling appears to be standardising around the FC variable naming.
This patch changes the F77 namespace to FC instead and use the default
gfortran compiler. If anyone needs the F77 variables or tools, those
can still be made on a case by case basis.
Also updates local.conf.sample.extended accordingly.
(From OE-Core rev: ae8c17be2845eff2be8394a5d9a45e6aa321c33d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/native.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 7c4e8c35c6..b2d85efd21 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -59,7 +59,7 @@ export CONFIG_SITE = "${COREBASE}/meta/site/native" | |||
59 | # set the compiler as well. It could have been set to something else | 59 | # set the compiler as well. It could have been set to something else |
60 | export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" | 60 | export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" |
61 | export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" | 61 | export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" |
62 | export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" | 62 | export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}" |
63 | export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E" | 63 | export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E" |
64 | export LD = "${HOST_PREFIX}ld ${HOST_LD_ARCH} " | 64 | export LD = "${HOST_PREFIX}ld ${HOST_LD_ARCH} " |
65 | export CCLD = "${CC}" | 65 | export CCLD = "${CC}" |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index bbb1df677e..386c935492 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -446,7 +446,7 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" | |||
446 | 446 | ||
447 | export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" | 447 | export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" |
448 | export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" | 448 | export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" |
449 | export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" | 449 | export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" |
450 | export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" | 450 | export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" |
451 | export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" | 451 | export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" |
452 | export CCLD = "${CC}" | 452 | export CCLD = "${CC}" |
@@ -462,7 +462,7 @@ PYTHON = "${@sys.executable}" | |||
462 | 462 | ||
463 | export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" | 463 | export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" |
464 | export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" | 464 | export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" |
465 | export BUILD_F77 = "${CCACHE}${BUILD_PREFIX}g77 ${BUILD_CC_ARCH}" | 465 | export BUILD_FC = "${CCACHE}${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}" |
466 | export BUILD_CPP = "${BUILD_PREFIX}cpp ${BUILD_CC_ARCH}" | 466 | export BUILD_CPP = "${BUILD_PREFIX}cpp ${BUILD_CC_ARCH}" |
467 | export BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" | 467 | export BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" |
468 | export BUILD_CCLD = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" | 468 | export BUILD_CCLD = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" |