From fb396be2cd6a3ca22d9f3130c437d23ee1464284 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: Fri, 21 Jun 2019 00:00:00 +0000 Subject: [PATCH] build-m5: add missing CROSS_COMPILE parameter The build could fail with: ... make: arm-linux-gnueabi-ar: Command not found ... This was working by change previously because I must have had that installed on all my dev machines. I wonder how it got through Docker though. Oh well. --- build-m5 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-m5 b/build-m5 index ee7a811..74488c7 100755 --- a/build-m5 +++ b/build-m5 @@ -17,6 +17,7 @@ class Main(common.BuildCliFunction): '-j', str(self.env['nproc']), LF, '-f', 'Makefile.{}'.format(arch), LF, 'CC={}'.format(self.env['gcc_path']), LF, + 'CROSS_COMPILE={}'.format(self.env['toolchain_prefix_dash']), LF, 'LD={}'.format(self.env['ld_path']), LF, 'PWD={}'.format(self.env['gem5_m5_source_dir']), LF, ] @@ -31,7 +32,10 @@ class Main(common.BuildCliFunction): cwd=self.env['gem5_m5_source_dir'], ) os.makedirs(self.env['out_rootfs_overlay_bin_dir'], exist_ok=True) - self.sh.cp(os.path.join(self.env['gem5_m5_source_dir'], 'm5'), self.env['out_rootfs_overlay_bin_dir']) + self.sh.cp( + os.path.join(self.env['gem5_m5_source_dir'], 'm5'), + self.env['out_rootfs_overlay_bin_dir'] + ) def clean(self): self.sh.run_cmd(