diff -Naur Botan-1.10.1.orig/src/build-data/cc/gcc.txt Botan-1.10.1/src/build-data/cc/gcc.txt
--- Botan-1.10.1.orig/src/build-data/cc/gcc.txt	2012-04-20 16:20:56.000000000 -0400
+++ Botan-1.10.1/src/build-data/cc/gcc.txt	2012-04-20 16:27:14.000000000 -0400
@@ -13,10 +13,10 @@
 lang_flags "-D_REENTRANT -Wno-long-long"
 warning_flags "-W -Wall"
 
-maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast"
+#maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast"
 
-lib_opt_flags "-O3"
-check_opt_flags "-O2"
+lib_opt_flags "$(CXXFLAGS)"
+check_opt_flags "$(CXXFLAGS)"
 shared_flags "-fPIC"
 debug_flags -g
 no_debug_flags "-finline-functions"
