diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-04 12:42:39 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-04 18:17:53 -0300 |
| commit | 60d25503ffab71314342f10ffd3d1d8be4eef9f9 (patch) | |
| tree | 7d657c98e9e1fad55da5fefd7a38c3c8bbdef3f8 /binary/Makefile.windows | |
| parent | b8d84a0b130622e16ab0e37c3c43d9844434a5c5 (diff) | |
| download | luarocks-60d25503ffab71314342f10ffd3d1d8be4eef9f9.tar.gz luarocks-60d25503ffab71314342f10ffd3d1d8be4eef9f9.tar.bz2 luarocks-60d25503ffab71314342f10ffd3d1d8be4eef9f9.zip | |
binary: derive library search paths; minor Windows fix
Diffstat (limited to 'binary/Makefile.windows')
| -rw-r--r-- | binary/Makefile.windows | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/binary/Makefile.windows b/binary/Makefile.windows index ea8f0a60..e21ae8df 100644 --- a/binary/Makefile.windows +++ b/binary/Makefile.windows | |||
| @@ -14,7 +14,6 @@ windows-binary: windows-deps/lib/liblua.a windows-deps/lib/libssl.a windows-deps | |||
| 14 | STATIC_GCC_AR=$(MINGW_PREFIX)-ar \ | 14 | STATIC_GCC_AR=$(MINGW_PREFIX)-ar \ |
| 15 | STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ | 15 | STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ |
| 16 | STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ | 16 | STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ |
| 17 | STATIC_GCC_LIBDIR=$(MINGW_SYSROOT)/lib \ | ||
| 18 | LUAROCKS_CROSS_COMPILING=1 \ | 17 | LUAROCKS_CROSS_COMPILING=1 \ |
| 19 | make binary LUA_DIR=$(PWD)/windows-deps BINARY_CC=$(MINGW_PREFIX)-gcc BINARY_NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT) | 18 | make binary LUA_DIR=$(PWD)/windows-deps BINARY_CC=$(MINGW_PREFIX)-gcc BINARY_NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT) |
| 20 | 19 | ||
| @@ -37,6 +36,7 @@ build-windows-deps/openssl-$(OPENSSL_VERSION): build-windows-deps/openssl-$(OPEN | |||
| 37 | cd build-windows-deps && tar zxvpf openssl-$(OPENSSL_VERSION).tar.gz | 36 | cd build-windows-deps && tar zxvpf openssl-$(OPENSSL_VERSION).tar.gz |
| 38 | windows-deps/lib/libssl.a: build-windows-deps/openssl-$(OPENSSL_VERSION) | 37 | windows-deps/lib/libssl.a: build-windows-deps/openssl-$(OPENSSL_VERSION) |
| 39 | cd build-windows-deps/openssl-$(OPENSSL_VERSION) && ./Configure --prefix=$(PWD)/windows-deps --cross-compile-prefix=$(MINGW_PREFIX)- $(OPENSSL_PLATFORM) | 38 | cd build-windows-deps/openssl-$(OPENSSL_VERSION) && ./Configure --prefix=$(PWD)/windows-deps --cross-compile-prefix=$(MINGW_PREFIX)- $(OPENSSL_PLATFORM) |
| 39 | cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make | ||
| 40 | cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make install_sw | 40 | cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make install_sw |
| 41 | 41 | ||
| 42 | build-windows-deps/zlib-$(ZLIB_VERSION).tar.gz: | 42 | build-windows-deps/zlib-$(ZLIB_VERSION).tar.gz: |