diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-01-05 00:27:50 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-01-05 02:48:43 +0200 |
| commit | 637f18d618b99b5c08729457bcd2aebd7b6bb791 (patch) | |
| tree | e33ce95951ae7f988fb51f9b0b4e4e6210c25ea7 | |
| parent | 4414923f385ab37814fa2ae6cf054eadb787f322 (diff) | |
| download | meson-updated6354.tar.gz | |
Fix linker passing for armclang.updated6354
| -rw-r--r-- | cross/armclang-linux.txt | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt index 2772d827b..6df78d61a 100644 --- a/cross/armclang-linux.txt +++ b/cross/armclang-linux.txt @@ -26,7 +26,7 @@ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar' [properties] -#c_args = ['--target=aarch64-arm-none-eabi'] +c_args = ['--target=aarch64-arm-none-eabi'] [host_machine] system = 'baremetal' diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index db7abf038..202264660 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -145,7 +145,7 @@ class EmscriptenCCompiler(LinkerEnvVarsMixin, EmscriptenMixin, BasicLinkerIsComp class ArmclangCCompiler(ArmclangCompiler, CCompiler): def __init__(self, exelist, version, for_machine: MachineChoice, - info: 'MachineInfo', is_cross, exe_wrapper=None, **kwargs): + is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs): CCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs) ArmclangCompiler.__init__(self) |