summaryrefslogtreecommitdiffstats
path: root/meta/classes/sanity.bbclass
diff options
context:
space:
mode:
authorJérémy Rosen <jeremy.rosen@smile.fr>2016-09-07 11:08:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:07 +0100
commitcc27fa238fbc553cca469db8a5b7362e40da7545 (patch)
tree5e4604afddc2c61e46e80e92d8fb27fa5587b0c5 /meta/classes/sanity.bbclass
parent9da9abdd4d47473a7364782ca29da14383a023d8 (diff)
downloadpoky-cc27fa238fbc553cca469db8a5b7362e40da7545.tar.gz
sanity: fix hardcoded references to gcc
(From OE-Core rev: 89f55bf8e9d633cfb508a0885a462afb561c7cee) Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r--meta/classes/sanity.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 202b5db793..f17e2d4cd0 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -459,19 +459,19 @@ def check_gcc_march(sanity_data):
459 459
460 # Check if GCC could work without march 460 # Check if GCC could work without march
461 if not result: 461 if not result:
462 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_PREFIX}gcc gcc_test.c -o gcc_test")) 462 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_CC} gcc_test.c -o gcc_test"))
463 if status == 0: 463 if status == 0:
464 result = True; 464 result = True;
465 465
466 if not result: 466 if not result:
467 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_PREFIX}gcc -march=native gcc_test.c -o gcc_test")) 467 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_CC} -march=native gcc_test.c -o gcc_test"))
468 if status == 0: 468 if status == 0:
469 message = "BUILD_CFLAGS_append = \" -march=native\"" 469 message = "BUILD_CFLAGS_append = \" -march=native\""
470 result = True; 470 result = True;
471 471
472 if not result: 472 if not result:
473 build_arch = sanity_data.getVar('BUILD_ARCH', True) 473 build_arch = sanity_data.getVar('BUILD_ARCH', True)
474 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_PREFIX}gcc -march=%s gcc_test.c -o gcc_test" % build_arch)) 474 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_CC} -march=%s gcc_test.c -o gcc_test" % build_arch))
475 if status == 0: 475 if status == 0:
476 message = "BUILD_CFLAGS_append = \" -march=%s\"" % build_arch 476 message = "BUILD_CFLAGS_append = \" -march=%s\"" % build_arch
477 result = True; 477 result = True;
@@ -673,11 +673,11 @@ def check_sanity_version_change(status, d):
673 if not check_app_exists("${MAKE}", d): 673 if not check_app_exists("${MAKE}", d):
674 missing = missing + "GNU make," 674 missing = missing + "GNU make,"
675 675
676 if not check_app_exists('${BUILD_PREFIX}gcc', d): 676 if not check_app_exists('${BUILD_CC}', d):
677 missing = missing + "C Compiler (%sgcc)," % d.getVar("BUILD_PREFIX", True) 677 missing = missing + "C Compiler (%s)," % d.getVar("BUILD_CC", True)
678 678
679 if not check_app_exists('${BUILD_PREFIX}g++', d): 679 if not check_app_exists('${BUILD_CXX}', d):
680 missing = missing + "C++ Compiler (%sg++)," % d.getVar("BUILD_PREFIX", True) 680 missing = missing + "C++ Compiler (%s)," % d.getVar("BUILD_CXX", True)
681 681
682 required_utilities = d.getVar('SANITY_REQUIRED_UTILITIES', True) 682 required_utilities = d.getVar('SANITY_REQUIRED_UTILITIES', True)
683 683