diff options
| author | Ole André Vadla RavnÄs <oleavr@gmail.com> | 2017-05-21 20:35:44 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-21 23:04:19 +0300 |
| commit | b595cda4ed0ca699da3052a6bd30ba7d1dae1124 (patch) | |
| tree | 587c4654ebe3d2956fdca855c23f62f32e5fa346 /mesonbuild/backend/ninjabackend.py | |
| parent | 5794f37af5c5ce0010168d163f2568d7581b5a13 (diff) | |
| download | meson-b595cda4ed0ca699da3052a6bd30ba7d1dae1124.zip meson-b595cda4ed0ca699da3052a6bd30ba7d1dae1124.tar.gz meson-b595cda4ed0ca699da3052a6bd30ba7d1dae1124.tar.bz2 | |
Fix cross environment pollution.
Environment variables like CFLAGS and LDFLAGS should not affect the
cross environment.
Fixes #1772
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 4b12da6..e12678d 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2267,9 +2267,10 @@ rule FORTRAN_DEP_HACK # Add link args added using add_global_link_arguments() # These override per-project link arguments commands += self.build.get_global_link_args(linker) - # Link args added from the env: LDFLAGS. We want these to - # override all the defaults but not the per-target link args. - commands += self.environment.coredata.external_link_args[linker.get_language()] + if not target.is_cross: + # Link args added from the env: LDFLAGS. We want these to + # override all the defaults but not the per-target link args. + commands += self.environment.coredata.external_link_args[linker.get_language()] # Now we will add libraries and library paths from various sources |