diff options
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index 1d6145d8..b1381e0d 100644 --- a/src/Makefile +++ b/src/Makefile | |||
@@ -288,15 +288,15 @@ ifeq (Windows,$(TARGET_SYS)) | |||
288 | TARGET_XSHLDFLAGS= -shared | 288 | TARGET_XSHLDFLAGS= -shared |
289 | TARGET_DYNXLDOPTS= | 289 | TARGET_DYNXLDOPTS= |
290 | else | 290 | else |
291 | ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) | ||
292 | TARGET_XCFLAGS+= -fno-stack-protector | ||
293 | endif | ||
291 | ifeq (Darwin,$(TARGET_SYS)) | 294 | ifeq (Darwin,$(TARGET_SYS)) |
292 | ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) | 295 | ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) |
293 | export MACOSX_DEPLOYMENT_TARGET=10.4 | 296 | export MACOSX_DEPLOYMENT_TARGET=10.4 |
294 | endif | 297 | endif |
295 | TARGET_STRIP+= -x | 298 | TARGET_STRIP+= -x |
296 | TARGET_AR+= 2>/dev/null | 299 | TARGET_AR+= 2>/dev/null |
297 | ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) | ||
298 | TARGET_XCFLAGS+= -fno-stack-protector | ||
299 | endif | ||
300 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC | 300 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC |
301 | TARGET_DYNXLDOPTS= | 301 | TARGET_DYNXLDOPTS= |
302 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) | 302 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) |
@@ -308,14 +308,10 @@ else | |||
308 | ifeq (iOS,$(TARGET_SYS)) | 308 | ifeq (iOS,$(TARGET_SYS)) |
309 | TARGET_STRIP+= -x | 309 | TARGET_STRIP+= -x |
310 | TARGET_AR+= 2>/dev/null | 310 | TARGET_AR+= 2>/dev/null |
311 | TARGET_XCFLAGS+= -fno-stack-protector | ||
312 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC | 311 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC |
313 | TARGET_DYNXLDOPTS= | 312 | TARGET_DYNXLDOPTS= |
314 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) | 313 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) |
315 | else | 314 | else |
316 | ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs))) | ||
317 | TARGET_XCFLAGS+= -fno-stack-protector | ||
318 | endif | ||
319 | ifneq (SunOS,$(TARGET_SYS)) | 315 | ifneq (SunOS,$(TARGET_SYS)) |
320 | ifneq (PS3,$(TARGET_SYS)) | 316 | ifneq (PS3,$(TARGET_SYS)) |
321 | TARGET_XLDFLAGS+= -Wl,-E | 317 | TARGET_XLDFLAGS+= -Wl,-E |