diff --git a/src/tools/darwin.jam b/src/tools/darwin.jam
index 6a94f5358..d6b1c3dd0 100644
--- a/src/tools/darwin.jam
+++ b/src/tools/darwin.jam
@@ -49,12 +49,18 @@ rule init ( version ? : command * : options * : requirement * )
     
     common.handle-options darwin : $(condition) : $(command) : $(options) ;
     
-    # GCC 4.0 and higher in Darwin does not have -fcoalesce-templates.
     local gccversion = [ SHELL "$(command:J= ) -dumpversion" ] ;
+    
+    # GCC 4.0 and higher in Darwin does not have -fcoalesce-templates.
     if $(gccversion) < "4.0.0"
     {
         flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ;
     }
+    # GCC 4.2 and higher in Darwin does not have -Wno-long-double.
+    if $(gccversion) < "4.2.0"
+    {
+        flags darwin.compile OPTIONS $(condition) : -Wno-long-double ;
+    }
 
     gcc.init-link-flags darwin darwin $(condition) ;
 
@@ -205,7 +211,7 @@ flags darwin.link OPTIONS <runtime-link>static
 flags darwin.link OPTIONS <variant>release : -Wl,-dead_strip -no_dead_strip_inits_and_terms ;
 
 flags darwin.compile OPTIONS <link>shared : -dynamic ;
-flags darwin.compile OPTIONS : -Wno-long-double -no-cpp-precomp  -gdwarf-2  ;
+flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 ;
 
 flags darwin.link FRAMEWORK <framework> ;