diff options
| author | Mike Pall <mike> | 2017-06-12 09:25:48 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2017-06-12 09:25:48 +0200 |
| commit | cf2dfaf3b4eef9b2de32d3be962b0336c3fe7dd1 (patch) | |
| tree | e3db466c1e5df761c46adf4894181448a6aef905 /src | |
| parent | 6a71e71c1430e5a8f794a52cb2da66e2693db796 (diff) | |
| parent | 82151a4514e6538086f3f5e01cb8d4b22287b14f (diff) | |
| download | luajit-cf2dfaf3b4eef9b2de32d3be962b0336c3fe7dd1.tar.gz luajit-cf2dfaf3b4eef9b2de32d3be962b0336c3fe7dd1.tar.bz2 luajit-cf2dfaf3b4eef9b2de32d3be962b0336c3fe7dd1.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index f56465d1..71ca028c 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -209,7 +209,7 @@ TARGET_CC= $(STATIC_CC) | |||
| 209 | TARGET_STCC= $(STATIC_CC) | 209 | TARGET_STCC= $(STATIC_CC) |
| 210 | TARGET_DYNCC= $(DYNAMIC_CC) | 210 | TARGET_DYNCC= $(DYNAMIC_CC) |
| 211 | TARGET_LD= $(CROSS)$(CC) | 211 | TARGET_LD= $(CROSS)$(CC) |
| 212 | TARGET_AR= $(CROSS)ar rcus 2>/dev/null | 212 | TARGET_AR= $(CROSS)ar rcus |
| 213 | TARGET_STRIP= $(CROSS)strip | 213 | TARGET_STRIP= $(CROSS)strip |
| 214 | 214 | ||
| 215 | TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) | 215 | TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) |
| @@ -308,6 +308,7 @@ ifeq (Windows,$(TARGET_SYS)) | |||
| 308 | TARGET_XSHLDFLAGS= -shared | 308 | TARGET_XSHLDFLAGS= -shared |
| 309 | TARGET_DYNXLDOPTS= | 309 | TARGET_DYNXLDOPTS= |
| 310 | else | 310 | else |
| 311 | TARGET_AR+= 2>/dev/null | ||
| 311 | ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) | 312 | ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) |
| 312 | TARGET_XCFLAGS+= -fno-stack-protector | 313 | TARGET_XCFLAGS+= -fno-stack-protector |
| 313 | endif | 314 | endif |