From ddf2f6c343ba668d68897ecaf6237702a54d948b Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Tue, 28 Jun 2022 12:56:27 +0100 Subject: Fixed native build toolchain and compiler prefix * When build=native toolchain_prefix and compiler_prefix must be set to "" instead of auto * Resolves COMPMID-5395 Change-Id: I481ee4596e16d55d2a696af9124a0d06c916cef7 Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7855 Tested-by: Arm Jenkins Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- SConstruct | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index be438e05f3..53cdc3b904 100644 --- a/SConstruct +++ b/SConstruct @@ -347,17 +347,14 @@ if 'x86' not in env['arch']: elif env['os'] == 'tizen': auto_toolchain_prefix = "aarch64-tizen-linux-gnu-" -if env['build'] == 'native': - toolchain_prefix = "" - -if env["toolchain_prefix"] == "": +if env['build'] == 'native' or env["toolchain_prefix"] == "": toolchain_prefix = "" elif env["toolchain_prefix"] == "auto": toolchain_prefix = auto_toolchain_prefix else: toolchain_prefix = env["toolchain_prefix"] -if env["compiler_prefix"] == "": +if env['build'] == 'native' or env["compiler_prefix"] == "": compiler_prefix = "" elif env["compiler_prefix"] == "auto": compiler_prefix = toolchain_prefix -- cgit v1.2.1