aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2017-06-12 09:24:00 +0200
committerMike Pall <mike>2017-06-12 09:24:00 +0200
commit82151a4514e6538086f3f5e01cb8d4b22287b14f (patch)
treeab9a568db5169405f6bb25d4918bfb7d7c03f868
parentc7c3c4da432ddb543d4b0a9abbb245f11b26afd0 (diff)
downloadluajit-82151a4514e6538086f3f5e01cb8d4b22287b14f.tar.gz
luajit-82151a4514e6538086f3f5e01cb8d4b22287b14f.tar.bz2
luajit-82151a4514e6538086f3f5e01cb8d4b22287b14f.zip
Modify fix for warning from 'ar'.
-rw-r--r--src/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index f7f81a4e..24e8c0e0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -208,7 +208,7 @@ TARGET_CC= $(STATIC_CC)
208TARGET_STCC= $(STATIC_CC) 208TARGET_STCC= $(STATIC_CC)
209TARGET_DYNCC= $(DYNAMIC_CC) 209TARGET_DYNCC= $(DYNAMIC_CC)
210TARGET_LD= $(CROSS)$(CC) 210TARGET_LD= $(CROSS)$(CC)
211TARGET_AR= $(CROSS)ar rcus 2>/dev/null 211TARGET_AR= $(CROSS)ar rcus
212TARGET_STRIP= $(CROSS)strip 212TARGET_STRIP= $(CROSS)strip
213 213
214TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) 214TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
@@ -293,6 +293,7 @@ ifeq (Windows,$(TARGET_SYS))
293 TARGET_XSHLDFLAGS= -shared 293 TARGET_XSHLDFLAGS= -shared
294 TARGET_DYNXLDOPTS= 294 TARGET_DYNXLDOPTS=
295else 295else
296 TARGET_AR+= 2>/dev/null
296ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) 297ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
297 TARGET_XCFLAGS+= -fno-stack-protector 298 TARGET_XCFLAGS+= -fno-stack-protector
298endif 299endif