Browse Source

use proper method to disable a flag

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Thorsten Glaser 13 years ago
parent
commit
529d3cdead
2 changed files with 1 additions and 10 deletions
  1. 1 0
      package/mksh/Makefile
  2. 0 10
      package/mksh/patches/patch-Build_sh

+ 1 - 0
package/mksh/Makefile

@@ -33,6 +33,7 @@ INSTALL_STYLE:=		manual
 do-build:
 do-build:
 	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
 	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
 	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
 	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+	    HAVE_CAN_FSTACKPROTECTORALL=0 \
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -combine
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -combine
 
 
 do-install:
 do-install:

+ 0 - 10
package/mksh/patches/patch-Build_sh

@@ -1,10 +0,0 @@
---- mksh.orig/Build.sh	2011-04-14 19:46:02.037662289 +0200
-+++ mksh/Build.sh	2011-04-14 19:45:49.357672498 +0200
-@@ -816,7 +816,6 @@ if test $ct = gcc; then
- 	# The following tests run with -Werror (gcc only) if possible
- 	NOWARN=$DOWARN; phase=u
- 	ac_flags 1 fnostrictaliasing -fno-strict-aliasing
--	ac_flags 1 fstackprotectorall -fstack-protector-all
- 	ac_flags 1 fwrapv -fwrapv
- 	test $cm = combine && ac_flags 0 combine \
- 	    '-fwhole-program --combine' \