diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
index 1b32fe7..9340b5a 100644
--- a/tools/build/src/tools/gcc.jam
+++ b/tools/build/src/tools/gcc.jam
@@ -332,7 +332,9 @@ rule set-fpic-options ( targets * : sources * : properties * )
 
 rule set-address-model-options ( targets * : sources * : properties * )
 {
-    local model = [ feature.get-values address-model : $(properties) ] ;
+    # For RPM builds the address model flag is passed in %{optflags}.
+    # local model = [ feature.get-values address-model : $(properties) ] ;
+    local model ;
     if $(model)
     {
         local option ;