lua: fix linkage
This fixes a couple of problems: * Lua 5.1 doesn't have SYSLIBS, so wasn't being linked with any libraries. * SYSLIBS doesn't include -lm, so we had to add that manually to pkgconfig. LIBS includes -lm, so we don't need that hack any more.
This commit is contained in:
parent
1758c0ac65
commit
665732d877
|
@ -93,7 +93,7 @@ self = stdenv.mkDerivation rec {
|
|||
Description: An Extensible Extension Language
|
||||
Version: ${version}
|
||||
Requires:
|
||||
Libs: -L$out/lib -llua -lm
|
||||
Libs: -L$out/lib -llua
|
||||
Cflags: -I$out/include
|
||||
EOF
|
||||
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$(LUA_SO): $(CORE_O) $(LIB_O)
|
||||
$(CC) -shared $(SYSLIBS) -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? $(MYLDFLAGS)
|
||||
$(CC) -shared $(LIBS) -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? $(MYLDFLAGS)
|
||||
ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
|
||||
ln -sf $(LUA_SO).$(R) $(LUA_SO)
|
||||
|
|
Loading…
Reference in a new issue