From adf3ab12889a0a172933cf688446df02ddbbe46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Thu, 14 Nov 2019 00:00:00 +0000 Subject: [PATCH] --gem5-clang takes precedence over --gem5-worktree in setting --build-id We are more likely to want to do a clang master test build separate from the main master. --- common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.py b/common.py index b4d06d3..05679f3 100644 --- a/common.py +++ b/common.py @@ -675,10 +675,10 @@ Incompatible archs are skipped. else: env['userland_build_id'] = env['default_build_id'] if not env['_args_given']['gem5_build_id']: - if env['_args_given']['gem5_worktree']: - env['gem5_build_id'] = env['gem5_worktree'] - elif env['_args_given']['gem5-clang']: + if env['_args_given']['gem5_clang']: env['gem5_build_id'] = 'clang' + elif env['_args_given']['gem5_worktree']: + env['gem5_build_id'] = env['gem5_worktree'] else: env['gem5_build_id'] = consts['default_build_id'] env['is_arm'] = False