diff options
| author | Mike Pall <mike> | 2020-06-15 11:23:04 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-06-15 11:23:04 +0200 |
| commit | 34e53736c6ed90dc56357aff22009e88b443ecfd (patch) | |
| tree | 31d888353e00e930fee7269cda18d98a4cd291a9 /src/Makefile | |
| parent | d333b1a6febf35f891fcd6e121876c9c3efee1e0 (diff) | |
| download | luajit-34e53736c6ed90dc56357aff22009e88b443ecfd.tar.gz luajit-34e53736c6ed90dc56357aff22009e88b443ecfd.tar.bz2 luajit-34e53736c6ed90dc56357aff22009e88b443ecfd.zip | |
Cleanup some arch defines and fix builds.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index a96c1997..667fff56 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -212,7 +212,7 @@ TARGET_CC= $(STATIC_CC) | |||
| 212 | TARGET_STCC= $(STATIC_CC) | 212 | TARGET_STCC= $(STATIC_CC) |
| 213 | TARGET_DYNCC= $(DYNAMIC_CC) | 213 | TARGET_DYNCC= $(DYNAMIC_CC) |
| 214 | TARGET_LD= $(CROSS)$(CC) | 214 | TARGET_LD= $(CROSS)$(CC) |
| 215 | TARGET_AR= $(CROSS)ar rcus | 215 | TARGET_AR= $(CROSS)ar rcus 2>/dev/null |
| 216 | TARGET_STRIP= $(CROSS)strip | 216 | TARGET_STRIP= $(CROSS)strip |
| 217 | 217 | ||
| 218 | TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) | 218 | TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) |
| @@ -312,7 +312,6 @@ ifeq (Windows,$(TARGET_SYS)) | |||
| 312 | TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,$(TARGET_DLLDOTANAME) | 312 | TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,$(TARGET_DLLDOTANAME) |
| 313 | TARGET_DYNXLDOPTS= | 313 | TARGET_DYNXLDOPTS= |
| 314 | else | 314 | else |
| 315 | TARGET_AR+= 2>/dev/null | ||
| 316 | ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) | 315 | ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) |
| 317 | TARGET_XCFLAGS+= -fno-stack-protector | 316 | TARGET_XCFLAGS+= -fno-stack-protector |
| 318 | endif | 317 | endif |
