diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2013-04-06 20:43:15 -0700 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-04-06 20:43:15 -0700 |
| commit | f17d742f952bb149877f18a953d4b07d8f973b3d (patch) | |
| tree | 2d08f2a93780163d75594f3549863817f59f6a04 /src | |
| parent | bee75662424508d617c8b80ab9bbda03e502354c (diff) | |
| parent | a5bb84bbe8581c9c1d1f8ee74b510be54556ea1d (diff) | |
| download | luarocks-f17d742f952bb149877f18a953d4b07d8f973b3d.tar.gz luarocks-f17d742f952bb149877f18a953d4b07d8f973b3d.tar.bz2 luarocks-f17d742f952bb149877f18a953d4b07d8f973b3d.zip | |
Merge pull request #113 from Tieske/MinGW_fix
Mingw fix and windows installer batch file updated
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/build/builtin.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua index f65774fd..853b0361 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua | |||
| @@ -73,9 +73,9 @@ function run(rockspec) | |||
| 73 | compile_library = function(library, objects, libraries, libdirs, name) | 73 | compile_library = function(library, objects, libraries, libdirs, name) |
| 74 | local extras = { unpack(objects) } | 74 | local extras = { unpack(objects) } |
| 75 | add_flags(extras, "-L%s", libdirs) | 75 | add_flags(extras, "-L%s", libdirs) |
| 76 | add_flags(extras, "%s.lib", libraries) | 76 | add_flags(extras, "-l%s", libraries) |
| 77 | extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB) | 77 | extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB) |
| 78 | extras[#extras+1] = "-l" .. (variables.MSVCRT or "msvcr80") | 78 | extras[#extras+1] = "-l" .. (variables.MSVCRT or "m") |
| 79 | local ok = execute(variables.LD.." "..variables.LIBFLAG, "-o", library, unpack(extras)) | 79 | local ok = execute(variables.LD.." "..variables.LIBFLAG, "-o", library, unpack(extras)) |
| 80 | return ok | 80 | return ok |
| 81 | end | 81 | end |
| @@ -89,7 +89,7 @@ function run(rockspec) | |||
| 89 | local ok = execute(variables.RC, "-o", resname, rcname) | 89 | local ok = execute(variables.RC, "-o", resname, rcname) |
| 90 | if not ok then return ok end | 90 | if not ok then return ok end |
| 91 | ok = execute(variables.LD, "-o", wrapname, resname, variables.WRAPPER, | 91 | ok = execute(variables.LD, "-o", wrapname, resname, variables.WRAPPER, |
| 92 | dir.path(variables.LUA_LIBDIR, variables.LUALIB), "-l" .. (variables.MSVCRT or "msvcr80"), "-luser32") | 92 | dir.path(variables.LUA_LIBDIR, variables.LUALIB), "-l" .. (variables.MSVCRT or "m"), "-luser32") |
| 93 | return ok, wrapname | 93 | return ok, wrapname |
| 94 | end | 94 | end |
| 95 | elseif cfg.is_platform("win32") then | 95 | elseif cfg.is_platform("win32") then |