diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-01-08 21:59:50 -0500 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-02-15 09:17:24 -0800 |
commit | d87744138ac72df23ecce950909ac89c1f0decc7 (patch) | |
tree | dd32a30d08205d975f71d407ebbd7ddd55c0fdfa /mesonbuild/backend/backends.py | |
parent | c83b426b0fd3426501fb4a6ea79245d8528e3284 (diff) | |
download | meson-d87744138ac72df23ecce950909ac89c1f0decc7.zip meson-d87744138ac72df23ecce950909ac89c1f0decc7.tar.gz meson-d87744138ac72df23ecce950909ac89c1f0decc7.tar.bz2 |
Remove remaining cross-specific compiler-args code
Since the consolidation of flags in `compiler_options.*`, this
cross/native special casing is not needed.
Diffstat (limited to 'mesonbuild/backend/backends.py')
-rw-r--r-- | mesonbuild/backend/backends.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index ba5bd90..14b189b 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -583,10 +583,10 @@ class Backend: for_machine = MachineChoice.BUILD else: for_machine = MachineChoice.HOST - if not target.is_cross: - # Compile args added from the env: CFLAGS/CXXFLAGS, etc. We want these - # to override all the defaults, but not the per-target compile args. - commands += self.environment.coredata.get_external_args(for_machine, compiler.get_language()) + # Compile args added from the env: CFLAGS/CXXFLAGS, etc, or the cross + # file. We want these to override all the defaults, but not the + # per-target compile args. + commands += self.environment.coredata.get_external_args(for_machine, compiler.get_language()) # Always set -fPIC for shared libraries if isinstance(target, build.SharedLibrary): commands += compiler.get_pic_args() |