diff -r afa3fde1f7a7 -r 1c56c03b7ed5 config/global/build-behave.in
--- a/config/global/build-behave.in	Sun Oct 16 13:26:26 2011 +0200
+++ b/config/global/build-behave.in	Fri Nov 16 15:25:57 2012 +0100
@@ -41,7 +41,27 @@
       Use gcc's option -pipe to use pipes rather than temp files when building
       the toolchain.
 
-config EXTRA_FLAGS_FOR_HOST
+config EXTRA_CFLAGS_FOR_BUILD
+    string
+    prompt "Extra build compiler flags"
+    default ""
+    help
+      Extra flags to pass to the build C and C++ compiler.
+
+      May be used to change the default features of the build
+      compiler such as turning off the stack protector or fortify.
+      
+config EXTRA_LDFLAGS_FOR_BUILD
+    string
+    prompt "Extra build linker flags"
+    default ""
+    help
+      Extra flags to pass to the build linker.
+
+      May be used to change the default features of the build
+      linker.
+      
+config EXTRA_CFLAGS_FOR_HOST
     string
     prompt "Extra host compiler flags"
     default ""
@@ -50,6 +70,16 @@
 
       May be used to change the default features of the host
       compiler such as turning off the stack protector or fortify.
+      
+config EXTRA_LDFLAGS_FOR_HOST
+    string
+    prompt "Extra host linker flags"
+    default ""
+    help
+      Extra flags to pass to the host linker.
+
+      May be used to change the default features of the host
+      linker.
 
 choice
     bool