diff options
| author | Eric Lemanissier <eric.lemanissier@gmail.com> | 2020-05-13 11:24:52 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-05-13 15:55:07 +0000 |
| commit | ab6a410426d614f95b779797f3dfb289eb3672d9 (patch) | |
| tree | 9c49e5c15a47c92df5acad21cc015712a8121e8d | |
| parent | 859dc4255aa40611d323d1b22f70bb20c09f317d (diff) | |
| download | meson-ab6a410426d614f95b779797f3dfb289eb3672d9.zip meson-ab6a410426d614f95b779797f3dfb289eb3672d9.tar.gz meson-ab6a410426d614f95b779797f3dfb289eb3672d9.tar.bz2 | |
macos: Remove framwork linkerlike args
fixes-up 33fbc548ab74e79280d2f57b2cd499d14c1f1e91
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 3d3a503..385ef5e 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1136,7 +1136,7 @@ class Compiler: def remove_linkerlike_args(self, args): rm_exact = ('-headerpad_max_install_names',) rm_prefixes = ('-Wl,', '-L',) - rm_next = ('-L',) + rm_next = ('-L', '-framework',) ret = [] iargs = iter(args) for arg in iargs: diff --git a/run_unittests.py b/run_unittests.py index 2939b20..d6f7911 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -5325,7 +5325,7 @@ class DarwinTests(BasePlatformTests): def test_removing_unused_linker_args(self): testdir = os.path.join(self.common_test_dir, '108 has arg') - env = {'CFLAGS': '-L/tmp -L /var/tmp -headerpad_max_install_names -Wl,-export_dynamic'} + env = {'CFLAGS': '-L/tmp -L /var/tmp -headerpad_max_install_names -Wl,-export_dynamic -framework Foundation'} self.init(testdir, override_envvars=env) |