diff options
| -rw-r--r-- | berkeleydb/makefile.mk | 2 | ||||
| -rw-r--r-- | cairo/cairo/makefile.mk | 2 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 | ||||
| -rw-r--r-- | curl/makefile.mk | 4 | ||||
| -rw-r--r-- | icu/makefile.mk | 5 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 4 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 2 | ||||
| -rw-r--r-- | python/makefile.mk | 4 |
8 files changed, 4 insertions, 21 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 963c61a3bbde..6b814163300b 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -76,7 +76,7 @@ CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' .EXPORT: LDFLAGS #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out # the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index e0b12cc9f551..564c5dd9995a 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -122,7 +122,7 @@ OUT2INC+=src$/cairo-quartz.h .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ELIF "$(OS)$(COM)"=="SOLARISC52" cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 20773c7597f8..4f8e5ca715aa 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" diff --git a/curl/makefile.mk b/curl/makefile.mk index 1fab0c301bff..f0d225cc493a 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -65,10 +65,6 @@ curl_CFLAGS+=-I$(SYSBASE)$/usr$/include curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" -.IF "$(OS)$(COM)$(CPU)"=="LINUXGCCI" -curl_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - .IF "$(OS)$(CPU)"=="SOLARISU" curl_CFLAGS+:=$(ARCH_FLAGS) curl_LDFLAGS+:=$(ARCH_FLAGS) diff --git a/icu/makefile.mk b/icu/makefile.mk index 70ff42c1a443..ee82ad48a9ec 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -78,11 +78,6 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" -# Disable executable stack -.IF "$(OS)$(COM)"=="LINUXGCC" -icu_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) icu_LDFLAGS+=$(EXTRA_LINKFLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 93275b65b2d8..70796380c3d9 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -87,10 +87,6 @@ xml2_CFLAGS+=$(ARCH_FLAGS) $(C_RESTRICTIONFLAGS) xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" -.IF "$(OS)$(COM)"=="LINUXGCC" -xml2_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - CONFIGURE_DIR= .IF "$(OS)"=="OS2" CONFIGURE_ACTION=sh .$/configure diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index b3f9ed203653..f7494022c980 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -87,7 +87,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/python/makefile.mk b/python/makefile.mk index 86d9835e8604..a6b73d04cc5d 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -66,10 +66,6 @@ CC+:=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" .ENDIF # "$(SYSBASE)"!="" -.IF "$(OS)$(COM)"=="LINUXGCC" -python_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - .IF "$(OS)$(CPU)"=="SOLARISU" CC+:=$(ARCH_FLAGS) python_LDFLAGS+=$(ARCH_FLAGS) |