diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-16 23:02:09 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-16 23:02:09 +0300 |
| commit | c58dd64f8e947f4659bcbc47d75e86e65043e714 (patch) | |
| tree | 28be176b2646b02ae6cc006a00608a1152db35be /mesonbuild/backend/ninjabackend.py | |
| parent | fa6ca160548d7e8df9c4c724e6c96f5e004e5316 (diff) | |
| parent | 7f8908336362cccd45516f48b5320380cec0e817 (diff) | |
| download | meson-c58dd64f8e947f4659bcbc47d75e86e65043e714.zip meson-c58dd64f8e947f4659bcbc47d75e86e65043e714.tar.gz meson-c58dd64f8e947f4659bcbc47d75e86e65043e714.tar.bz2 | |
Merged Arm CC support.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 2ba9178..7d86473 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1473,7 +1473,7 @@ int dummy; # gcc-ar blindly pass the --plugin argument to `ar` and you cannot pass # options as arguments while using the @file.rsp syntax. # See: https://github.com/mesonbuild/meson/issues/1646 - if mesonlib.is_windows() and not isinstance(static_linker, ArLinker): + if static_linker.can_linker_accept_rsp(): command_template = ''' command = {executable} @$out.rsp rspfile = $out.rsp rspfile_content = $LINK_ARGS {output_args} $in @@ -1528,7 +1528,7 @@ int dummy; except KeyError: pass rule = 'rule %s%s_LINKER\n' % (langname, crstr) - if mesonlib.is_windows(): + if compiler.can_linker_accept_rsp(): command_template = ''' command = {executable} @$out.rsp rspfile = $out.rsp rspfile_content = $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing @@ -1657,7 +1657,7 @@ rule FORTRAN_DEP_HACK if getattr(self, 'created_llvm_ir_rule', False): return rule = 'rule llvm_ir{}_COMPILER\n'.format('_CROSS' if is_cross else '') - if mesonlib.is_windows(): + if compiler.can_linker_accept_rsp(): command_template = ' command = {executable} @$out.rsp\n' \ ' rspfile = $out.rsp\n' \ ' rspfile_content = $ARGS{cross_args} {output_args} {compile_only_args} $in\n' @@ -1718,7 +1718,7 @@ rule FORTRAN_DEP_HACK d = quote_func(d) quoted_depargs.append(d) cross_args = self.get_cross_info_lang_args(langname, is_cross) - if mesonlib.is_windows(): + if compiler.can_linker_accept_rsp(): command_template = ''' command = {executable} @$out.rsp rspfile = $out.rsp rspfile_content = $ARGS {cross_args} {dep_args} {output_args} {compile_only_args} $in |