summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2014-12-08 02:07:05 +0100
committerMike Pall <mike>2014-12-08 02:07:05 +0100
commit6fddb9bc2e9e85a89aa229538103f1bd80d6b5be (patch)
treeef8fed39fa60e6503ed8ca0fd0beaf2c72ed0ef6
parent3f2e4ec69946fa2c37b6a571948ee0909f6ddbea (diff)
downloadluajit-6fddb9bc2e9e85a89aa229538103f1bd80d6b5be.tar.gz
luajit-6fddb9bc2e9e85a89aa229538103f1bd80d6b5be.tar.bz2
luajit-6fddb9bc2e9e85a89aa229538103f1bd80d6b5be.zip
Avoid error messages when building with Clang.
-rw-r--r--src/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile
index c558003c..541abb90 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -290,15 +290,15 @@ ifeq (Windows,$(TARGET_SYS))
290 TARGET_XSHLDFLAGS= -shared 290 TARGET_XSHLDFLAGS= -shared
291 TARGET_DYNXLDOPTS= 291 TARGET_DYNXLDOPTS=
292else 292else
293ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
294 TARGET_XCFLAGS+= -fno-stack-protector
295endif
293ifeq (Darwin,$(TARGET_SYS)) 296ifeq (Darwin,$(TARGET_SYS))
294 ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) 297 ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
295 export MACOSX_DEPLOYMENT_TARGET=10.4 298 export MACOSX_DEPLOYMENT_TARGET=10.4
296 endif 299 endif
297 TARGET_STRIP+= -x 300 TARGET_STRIP+= -x
298 TARGET_AR+= 2>/dev/null 301 TARGET_AR+= 2>/dev/null
299 ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
300 TARGET_XCFLAGS+= -fno-stack-protector
301 endif
302 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 302 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
303 TARGET_DYNXLDOPTS= 303 TARGET_DYNXLDOPTS=
304 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 304 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
@@ -310,14 +310,10 @@ else
310ifeq (iOS,$(TARGET_SYS)) 310ifeq (iOS,$(TARGET_SYS))
311 TARGET_STRIP+= -x 311 TARGET_STRIP+= -x
312 TARGET_AR+= 2>/dev/null 312 TARGET_AR+= 2>/dev/null
313 TARGET_XCFLAGS+= -fno-stack-protector
314 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 313 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
315 TARGET_DYNXLDOPTS= 314 TARGET_DYNXLDOPTS=
316 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 315 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
317else 316else
318 ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
319 TARGET_XCFLAGS+= -fno-stack-protector
320 endif
321 ifneq (SunOS,$(TARGET_SYS)) 317 ifneq (SunOS,$(TARGET_SYS))
322 ifneq (PS3,$(TARGET_SYS)) 318 ifneq (PS3,$(TARGET_SYS))
323 TARGET_XLDFLAGS+= -Wl,-E 319 TARGET_XLDFLAGS+= -Wl,-E