summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-19 16:27:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-20 16:06:02 +0100
commit7283c149df6f1400501d78e5cd2e4452721691c0 (patch)
tree870deddbefeac580e85c4c7ea812fd34075fa660 /meta/classes
parentf038f069977170e323c9c6884c69e0b9e1cf1c6f (diff)
downloadpoky-7283c149df6f1400501d78e5cd2e4452721691c0.tar.gz
sanity.bbclass: Ensure we expand BUILD_PREFIX
This likely used to work when we expanded python functions and broke when we stopped. Since it defaults to "", it never caused an issue but is incorrect usage so fix it. (From OE-Core rev: bfb395fdea642b306f110b4b8f1046f1992c622c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 98345ce103..202b5db793 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("${BUILD_PREFIX}gcc gcc_test.c -o gcc_test") 462 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_PREFIX}gcc 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("${BUILD_PREFIX}gcc -march=native gcc_test.c -o gcc_test") 467 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_PREFIX}gcc -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("${BUILD_PREFIX}gcc -march=%s gcc_test.c -o gcc_test" % build_arch) 474 status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_PREFIX}gcc -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;