diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2022-02-17 17:10:44 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2022-02-17 17:10:44 -0300 |
| commit | c975c3b970eb1dffb4f448ff2d9dce54f63689e0 (patch) | |
| tree | dca6223118f80de72c295bbd367f97c98ca21198 | |
| parent | a58f594048470bfa3c3459e4a2c95ab924f1e89b (diff) | |
| download | luarocks-c975c3b970eb1dffb4f448ff2d9dce54f63689e0.tar.gz luarocks-c975c3b970eb1dffb4f448ff2d9dce54f63689e0.tar.bz2 luarocks-c975c3b970eb1dffb4f448ff2d9dce54f63689e0.zip | |
fix: avoid quoting issues with LIBFLAG on MacOS
| -rw-r--r-- | src/luarocks/build/builtin.lua | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 186 | add_flags(extras, "-l%s", libraries) | 186 | add_flags(extras, "-l%s", libraries) |
| 187 | extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB) | 187 | extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB) |
| 188 | extras[#extras+1] = "-l" .. (variables.MSVCRT or "m") | 188 | extras[#extras+1] = "-l" .. (variables.MSVCRT or "m") |
| 189 | local ok = execute(variables.LD.." "..variables.LDFLAGS, variables.LIBFLAG, "-o", library, unpack(extras)) | 189 | local ok = execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras)) |
| 190 | return ok | 190 | return ok |
| 191 | end | 191 | end |
| 192 | --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format. | 192 | --[[ 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) | |||
| 254 | extras[#extras+1] = "-L"..variables.LUA_LIBDIR | 254 | extras[#extras+1] = "-L"..variables.LUA_LIBDIR |
| 255 | extras[#extras+1] = "-llua" | 255 | extras[#extras+1] = "-llua" |
| 256 | end | 256 | end |
| 257 | return execute(variables.LD.." "..variables.LDFLAGS, variables.LIBFLAG, "-o", library, unpack(extras)) | 257 | return execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras)) |
| 258 | end | 258 | end |
| 259 | compile_static_library = function(library, objects, libraries, libdirs, name) -- luacheck: ignore 211 | 259 | compile_static_library = function(library, objects, libraries, libdirs, name) -- luacheck: ignore 211 |
| 260 | local ok = execute(variables.AR, "rc", library, unpack(objects)) | 260 | local ok = execute(variables.AR, "rc", library, unpack(objects)) |