diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2023-01-09 11:15:42 +0100 |
---|---|---|
committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-01-11 15:58:16 -0500 |
commit | cf23e341878286790885352fd1d6548be5798391 (patch) | |
tree | 34a7fe0711180a015a1327c0d082990bd61cd075 /cross/armclang-linux.txt | |
parent | e96929f1b267c40d27bcd81c61663229dbc3c3f1 (diff) | |
download | meson-cf23e341878286790885352fd1d6548be5798391.zip meson-cf23e341878286790885352fd1d6548be5798391.tar.gz meson-cf23e341878286790885352fd1d6548be5798391.tar.bz2 |
cross: move multilib options to [binaries] section
c_args are meant to be overridden by the user if needed (even via the
environment CFLAGS variables + -Doptimization=plain, for example),
so they should not contain any option that affect the multilib search
path. For example, a hypothetical native file like this:
[binaries]
c = gcc
[built-in options]
c_args = ['-m32']
would *not* build 32-bit binaries if -Dc_args is passed to meson.
Such options, instead should be in the [binaries] section. Adjust
the sample cross files included with meson.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'cross/armclang-linux.txt')
-rw-r--r-- | cross/armclang-linux.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt index 10f6fa4..863b355 100644 --- a/cross/armclang-linux.txt +++ b/cross/armclang-linux.txt @@ -17,16 +17,13 @@ [binaries] # we could set exe_wrapper = qemu-arm-static but to test the case # when cross compiled binaries can't be run we don't do that -c = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang' +c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--target=aarch64-arm-none-eabi'] #c = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler5.06u6/bin/armcc' #cpp = '/usr/bin/arm-linux-gnueabihf-g++' ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar' #strip = '/usr/arm-linux-gnueabihf/bin/strip' #pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config' -[built-in options] -c_args = ['--target=aarch64-arm-none-eabi'] - [host_machine] system = 'baremetal' cpu_family = 'arm' |