diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 10 |
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= |
| 292 | else | 292 | else |
| 293 | ifeq (,$(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 | ||
| 295 | endif | ||
| 293 | ifeq (Darwin,$(TARGET_SYS)) | 296 | ifeq (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 | |||
| 310 | ifeq (iOS,$(TARGET_SYS)) | 310 | ifeq (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) |
| 317 | else | 316 | else |
| 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 |
