aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index d22eb732..71c284e2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -158,7 +158,6 @@ XCFLAGS=
158 158
159ifeq (Windows,$(findstring Windows,$(OS))$(MSYSTEM)$(TERM)) 159ifeq (Windows,$(findstring Windows,$(OS))$(MSYSTEM)$(TERM))
160 HOST_SYS= Windows 160 HOST_SYS= Windows
161 HOST_RM= del
162else 161else
163 HOST_SYS:= $(shell uname -s) 162 HOST_SYS:= $(shell uname -s)
164 ifneq (,$(findstring MINGW,$(HOST_SYS))) 163 ifneq (,$(findstring MINGW,$(HOST_SYS)))
@@ -221,6 +220,7 @@ TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
221TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib 220TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib
222TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME) 221TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME)
223TARGET_DLLNAME= lua$(NODOTABIVER).dll 222TARGET_DLLNAME= lua$(NODOTABIVER).dll
223TARGET_DLLDOTANAME= libluajit-$(ABIVER).dll.a
224TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME) 224TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
225TARGET_DYNXLDOPTS= 225TARGET_DYNXLDOPTS=
226 226
@@ -309,8 +309,9 @@ endif
309TARGET_SYS?= $(HOST_SYS) 309TARGET_SYS?= $(HOST_SYS)
310ifeq (Windows,$(TARGET_SYS)) 310ifeq (Windows,$(TARGET_SYS))
311 TARGET_STRIP+= --strip-unneeded 311 TARGET_STRIP+= --strip-unneeded
312 TARGET_XSHLDFLAGS= -shared 312 TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,$(TARGET_DLLDOTANAME)
313 TARGET_DYNXLDOPTS= 313 TARGET_DYNXLDOPTS=
314 HOST_RM= del
314else 315else
315 TARGET_AR+= 2>/dev/null 316 TARGET_AR+= 2>/dev/null
316ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) 317ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
@@ -318,7 +319,7 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector
318endif 319endif
319ifeq (Darwin,$(TARGET_SYS)) 320ifeq (Darwin,$(TARGET_SYS))
320 ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) 321 ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
321 export MACOSX_DEPLOYMENT_TARGET=10.4 322 $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
322 endif 323 endif
323 TARGET_STRIP+= -x 324 TARGET_STRIP+= -x
324 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 325 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC