aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index 6a9461f0..28075d36 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -219,10 +219,6 @@ TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAG
219TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) 219TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS)
220TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS) 220TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS)
221 221
222ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
223 TARGET_XCFLAGS+= -fno-stack-protector
224endif
225
226TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM) 222TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM)
227ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH))) 223ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH)))
228 TARGET_CCARCH= x64 224 TARGET_CCARCH= x64
@@ -293,9 +289,12 @@ ifeq (Windows,$(TARGET_SYS))
293 TARGET_DYNXLDOPTS= 289 TARGET_DYNXLDOPTS=
294else 290else
295ifeq (Darwin,$(TARGET_SYS)) 291ifeq (Darwin,$(TARGET_SYS))
296 export MACOSX_DEPLOYMENT_TARGET=10.4 292 ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
293 export MACOSX_DEPLOYMENT_TARGET=10.4
294 endif
297 TARGET_STRIP+= -x 295 TARGET_STRIP+= -x
298 TARGET_AR+= 2>/dev/null 296 TARGET_AR+= 2>/dev/null
297 TARGET_XCFLAGS+= -fno-stack-protector
299 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 298 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
300 TARGET_DYNXLDOPTS= 299 TARGET_DYNXLDOPTS=
301 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 300 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
@@ -307,10 +306,14 @@ else
307ifeq (iOS,$(TARGET_SYS)) 306ifeq (iOS,$(TARGET_SYS))
308 TARGET_STRIP+= -x 307 TARGET_STRIP+= -x
309 TARGET_AR+= 2>/dev/null 308 TARGET_AR+= 2>/dev/null
309 TARGET_XCFLAGS+= -fno-stack-protector
310 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 310 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
311 TARGET_DYNXLDOPTS= 311 TARGET_DYNXLDOPTS=
312 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 312 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
313else 313else
314 ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
315 TARGET_XCFLAGS+= -fno-stack-protector
316 endif
314 ifneq (SunOS,$(TARGET_SYS)) 317 ifneq (SunOS,$(TARGET_SYS))
315 TARGET_XLDFLAGS+= -Wl,-E 318 TARGET_XLDFLAGS+= -Wl,-E
316 endif 319 endif