diff options
| author | Will Toohey <will@mon.im> | 2023-07-05 11:39:19 +1000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2023-12-01 22:11:41 +0200 |
| commit | 8c70ce466b9e323cb445f90044968e22d84b2888 (patch) | |
| tree | 4ca99b6602b2a77b5db9aaaaa99238cd092bd735 /mesonbuild/compilers | |
| parent | cf64e062bb6f8d95c73a6b292629a7776ff31864 (diff) | |
| download | meson-8c70ce466b9e323cb445f90044968e22d84b2888.tar.gz | |
More robust linker detection for armar (TI vs non-TI)
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 0bfedd139..10bbf5f37 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -204,8 +204,6 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker if any(os.path.basename(x) in {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'} for x in linker): arg = '/?' - elif linker_name in {'ar2000', 'ar2000.exe', 'ar430', 'ar430.exe', 'armar', 'armar.exe'}: - arg = '?' else: arg = '--version' try: @@ -234,7 +232,7 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker return linkers.CcrxLinker(linker) if out.startswith('GNU ar') and 'xc16-ar' in linker_name: return linkers.Xc16Linker(linker) - if 'Texas Instruments Incorporated' in out: + if "--> error: bad option 'e'" in err: # TI if 'ar2000' in linker_name: return linkers.C2000Linker(linker) else: |