From c975c3b970eb1dffb4f448ff2d9dce54f63689e0 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 17 Feb 2022 17:10:44 -0300 Subject: fix: avoid quoting issues with LIBFLAG on MacOS --- src/luarocks/build/builtin.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua index d8826851..0e8c3151 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua @@ -186,7 +186,7 @@ function builtin.run(rockspec, no_install) add_flags(extras, "-l%s", libraries) extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB) extras[#extras+1] = "-l" .. (variables.MSVCRT or "m") - local ok = execute(variables.LD.." "..variables.LDFLAGS, variables.LIBFLAG, "-o", library, unpack(extras)) + local ok = execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras)) return ok end --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format. @@ -254,7 +254,7 @@ function builtin.run(rockspec, no_install) extras[#extras+1] = "-L"..variables.LUA_LIBDIR extras[#extras+1] = "-llua" end - return execute(variables.LD.." "..variables.LDFLAGS, variables.LIBFLAG, "-o", library, unpack(extras)) + return execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras)) end compile_static_library = function(library, objects, libraries, libdirs, name) -- luacheck: ignore 211 local ok = execute(variables.AR, "rc", library, unpack(objects)) -- cgit v1.2.3-55-g6feb