diff options
| author | Nathanael Gray <nathanael.gray@fphcare.co.nz> | 2021-11-15 11:45:55 +1300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-11-27 20:08:14 +0200 |
| commit | 2bc3117408bf0c9f39c795c73eccd83fa1019dae (patch) | |
| tree | 8d8b002898eddeb4564d70d1c5b5ec68f376efe8 /mesonbuild/compilers | |
| parent | 26b102e817af99d8da55eecba09e8398ec0e3d88 (diff) | |
| download | meson-2bc3117408bf0c9f39c795c73eccd83fa1019dae.zip meson-2bc3117408bf0c9f39c795c73eccd83fa1019dae.tar.gz meson-2bc3117408bf0c9f39c795c73eccd83fa1019dae.tar.bz2 | |
Fix more code which appears copied from CcrxCompiler.
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/mixins/c2000.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/compilers/mixins/c2000.py b/mesonbuild/compilers/mixins/c2000.py index 65261c6..00c5e3a 100644 --- a/mesonbuild/compilers/mixins/c2000.py +++ b/mesonbuild/compilers/mixins/c2000.py @@ -106,9 +106,9 @@ class C2000Compiler(Compiler): result = [] for i in args: if i.startswith('-D'): - i = '-define=' + i[2:] + i = '--define=' + i[2:] if i.startswith('-I'): - i = '-include=' + i[2:] + i = '--include_path=' + i[2:] if i.startswith('-Wl,-rpath='): continue elif i == '--print-search-dirs': @@ -120,8 +120,10 @@ class C2000Compiler(Compiler): def compute_parameters_with_absolute_paths(self, parameter_list: T.List[str], build_dir: str) -> T.List[str]: for idx, i in enumerate(parameter_list): - if i[:9] == '-include=': - parameter_list[idx] = i[:9] + os.path.normpath(os.path.join(build_dir, i[9:])) + if i[:14] == '--include_path': + parameter_list[idx] = i[:14] + os.path.normpath(os.path.join(build_dir, i[14:])) + if i[:2] == '-I': + parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:])) return parameter_list |