diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-29 10:10:37 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-29 10:10:37 -0500 |
| commit | 6a6323ff096db76b0cd82f13c8f369ac08180ef7 (patch) | |
| tree | 5168b254edcf4307a0e94cbba86e954975e95d96 /mesonbuild/modules | |
| parent | 46b68d4c83bba705bb520877c7b0bd04c2f8cd5b (diff) | |
| download | meson-6a6323ff096db76b0cd82f13c8f369ac08180ef7.zip meson-6a6323ff096db76b0cd82f13c8f369ac08180ef7.tar.gz meson-6a6323ff096db76b0cd82f13c8f369ac08180ef7.tar.bz2 | |
external_project: Do not set LD in the env
This was breaking some autotools projects such as libyaml.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/unstable_external_project.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index 891ff75..933b064 100644 --- a/mesonbuild/modules/unstable_external_project.py +++ b/mesonbuild/modules/unstable_external_project.py @@ -119,7 +119,10 @@ class ExternalProject(InterpreterObject): link_exelist = compiler.get_linker_exelist() link_args = self.env.coredata.get_external_link_args(MachineChoice.HOST, lang) if link_exelist: - self.run_env['LD'] = self._quote_and_join(link_exelist) + # FIXME: Do not pass linker because Meson uses CC as linker wrapper, + # but autotools often expects the real linker (e.h. GNU ld). + # self.run_env['LD'] = self._quote_and_join(link_exelist) + pass self.run_env['LDFLAGS'] = self._quote_and_join(link_args) self.run_env = self.user_env.get_env(self.run_env) |