diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2018-06-20 14:07:47 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-01 15:51:13 -0300 |
commit | 0bab439d4b8f3d4c62340f7e0f6accca3355b30a (patch) | |
tree | 7679a5053ef65ddb56f4a51b595716e00e5c619c /src | |
parent | 5de72a61610f451ca45b4f8eedd9b9539571dca5 (diff) | |
download | luarocks-0bab439d4b8f3d4c62340f7e0f6accca3355b30a.tar.gz luarocks-0bab439d4b8f3d4c62340f7e0f6accca3355b30a.tar.bz2 luarocks-0bab439d4b8f3d4c62340f7e0f6accca3355b30a.zip |
builtin: only add Lua libdir when linking liblua
Diffstat (limited to 'src')
-rw-r--r-- | src/luarocks/build/builtin.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua index f414c166..7050cf8b 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua | |||
@@ -231,9 +231,10 @@ function builtin.run(rockspec) | |||
231 | end | 231 | end |
232 | add_flags(extras, "-l%s", libraries) | 232 | add_flags(extras, "-l%s", libraries) |
233 | if cfg.link_lua_explicitly then | 233 | if cfg.link_lua_explicitly then |
234 | add_flags(extras, "-l%s", {"lua"}) | 234 | extras[#extras+1] = "-L"..variables.LUA_LIBDIR |
235 | extras[#extras+1] = "-llua" | ||
235 | end | 236 | end |
236 | return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, "-L"..variables.LUA_LIBDIR, unpack(extras)) | 237 | return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, unpack(extras)) |
237 | end | 238 | end |
238 | compile_static_library = function(library, objects, libraries, libdirs, name) | 239 | compile_static_library = function(library, objects, libraries, libdirs, name) |
239 | local ok = execute(variables.AR, "rc", library, unpack(objects)) | 240 | local ok = execute(variables.AR, "rc", library, unpack(objects)) |