From 6a6323ff096db76b0cd82f13c8f369ac08180ef7 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 29 Jan 2021 10:10:37 -0500 Subject: [PATCH] external_project: Do not set LD in the env This was breaking some autotools projects such as libyaml. --- mesonbuild/modules/unstable_external_project.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index 891ff75f5..933b06441 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)