diff options
| author | Mike Pall <mike> | 2014-01-20 16:59:04 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-01-20 16:59:04 +0100 |
| commit | bcd27038fc59057213b7f844c7ae8621d3dff641 (patch) | |
| tree | b6ed85f6b47d57b41651a527a19e760ef2c1543a /src/Makefile | |
| parent | 4e78b9bb126a3c4a3d27770664452039419d339b (diff) | |
| parent | 92475419e5cc5e61c5feb6a0fe549b1fc4a9d7cf (diff) | |
| download | luajit-bcd27038fc59057213b7f844c7ae8621d3dff641.tar.gz luajit-bcd27038fc59057213b7f844c7ae8621d3dff641.tar.bz2 luajit-bcd27038fc59057213b7f844c7ae8621d3dff641.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 6eed3b91..722efc33 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -292,7 +292,9 @@ ifeq (Darwin,$(TARGET_SYS)) | |||
| 292 | endif | 292 | endif |
| 293 | TARGET_STRIP+= -x | 293 | TARGET_STRIP+= -x |
| 294 | TARGET_AR+= 2>/dev/null | 294 | TARGET_AR+= 2>/dev/null |
| 295 | TARGET_XCFLAGS+= -fno-stack-protector | 295 | ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) |
| 296 | TARGET_XCFLAGS+= -fno-stack-protector | ||
| 297 | endif | ||
| 296 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC | 298 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC |
| 297 | TARGET_DYNXLDOPTS= | 299 | TARGET_DYNXLDOPTS= |
| 298 | 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) |