From 776c859d86448222f12a2235751962b692deef52 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, 7 Jun 2019 00:00:00 +0000 Subject: [PATCH] arm: set userland prefix correctly for arm hosts --- common.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common.py b/common.py index 25ce8a5..cbfcf84 100644 --- a/common.py +++ b/common.py @@ -1006,8 +1006,10 @@ lunch aosp_{}-eng env['toolchain_prefix'] = '' else: env['toolchain_prefix'] = env['ubuntu_toolchain_prefix'] - if env['arch'] == 'x86_64': - env['userland_library_dir'] = '/' + if env['arch'] == env['host_arch']: + env['userland_library_dir'] = '/' + elif env['arch'] == 'x86_64': + env['userland_library_dir'] = '/usr/x86_64-linux-gnu/' elif env['arch'] == 'arm': env['userland_library_dir'] = '/usr/arm-linux-gnueabihf' elif env['arch'] == 'aarch64':