8 files changed, 14 insertions, 32 deletions
diff --git a/BUILD/compile-amd64-debug-max b/BUILD/compile-amd64-debug-max
index 466bea73179..530bdba009b 100755
--- a/BUILD/compile-amd64-debug-max
+++ b/BUILD/compile-amd64-debug-max
@@ -1,12 +1,9 @@
 #! /bin/sh
 path=`dirname $0`
 . "$path/SETUP.sh"
-base_cxxflags="$amd64_cxxflags $base_cxxflags"
-extra_flags="$amd64_cflags $debug_cflags"
+extra_flags="$amd64_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$amd64_configs $debug_configs"
-
-extra_configs="$extra_configs $max_configs"
+extra_configs="$amd64_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-amd64-max b/BUILD/compile-amd64-max
index 4a260859474..228448f6392 100755
--- a/BUILD/compile-amd64-max
+++ b/BUILD/compile-amd64-max
@@ -2,11 +2,7 @@
 
 path=`dirname $0`
 . "$path/SETUP.sh"
-base_cxxflags="$amd64_cxxflags $base_cxxflags"
-extra_flags="$amd64_cflags $fast_cflags -g"
-extra_configs="$amd64_configs"
-#strip=yes
-
-extra_configs="$extra_configs $max_configs"
+extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"
+extra_configs="$amd64_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index 6487c094cec..420657e0b73 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded
index f7a9d966d6d..803a6a9d6d3 100755
--- a/BUILD/compile-pentium-debug-max-no-embedded
+++ b/BUILD/compile-pentium-debug-max-no-embedded
@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs $max_no_es_configs"
+extra_configs="$pentium_configs $debug_configs $max_no_es_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max
index de37f28582b..595581f604e 100755
--- a/BUILD/compile-pentium-max
+++ b/BUILD/compile-pentium-max
@@ -3,10 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $fast_cflags -g"
-extra_configs="$pentium_configs"
-#strip=yes
-
-extra_configs="$extra_configs $max_configs"
+extra_flags="$pentium_cflags $fast_cflags $max_cflags -g"
+extra_configs="$pentium_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max
index 322b0735488..f0dc92c2ffd 100755
--- a/BUILD/compile-pentium-valgrind-max
+++ b/BUILD/compile-pentium-valgrind-max
@@ -3,7 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
diff --git a/BUILD/compile-ppc-debug-max b/BUILD/compile-ppc-debug-max
index 004e821d722..49d1442fd45 100755
--- a/BUILD/compile-ppc-debug-max
+++ b/BUILD/compile-ppc-debug-max
@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $debug_cflags"
+extra_flags="$ppc_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$debug_configs"
-
-extra_configs="$extra_configs $max_configs"
+extra_configs="$debug_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-ppc-max b/BUILD/compile-ppc-max
index 632db7216e4..1d89be81c9c 100755
--- a/BUILD/compile-ppc-max
+++ b/BUILD/compile-ppc-max
@@ -3,9 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $fast_cflags -g"
-#strip=yes
-
+extra_flags="$ppc_cflags $fast_cflags $max_cflags -g"
 extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"