--- ./myocamlbuild.ml	2015-05-23 14:35:18.000000000 -0700
+++ ./myocamlbuild.ml	2015-05-23 15:05:24.000000000 -0700
@@ -626,16 +626,18 @@
     rule "Generate lib/options.ml"
       ~prod:"lib/options.ml"
       ~deps:["lib/options.mlp"; "lib/enum_x_macro.h"]
-      (fun _ _ -> Cmd (S[A"gcc"; A"-E"; A"-P"; A"-x"; A"c";
+      (fun _ _ -> Cmd (S[A"cc"; A"-E"; A"-P"; A"-x"; A"c";
                          P"lib/options.mlp"; A"-o"; P"lib/options.ml"]));
 
     flag ["ocaml"; "link"; "library"; "native"] (S[A"-cclib"; A"-Llib";
                                                    A"-cclib"; A"-lre2_stubs";
-                                                   A"-cclib"; A"-lstdc++"]);
+                                                   A"-ccopt"; A"--stdlib=libc++";
+                                                   A"-cclib"; A"-lc++"]);
     flag ["ocaml"; "link"; "library"; "byte"]   (S[A"-dllib"; A"dllre2_stubs.so";
                                                    A"-cclib"; A"-Llib";
                                                    A"-cclib"; A"-lre2_stubs";
-                                                   A"-cclib"; A"-lstdc++"]);
+                                                   A"-ccopt"; A"--stdlib=libc++";                                                   
+                                                   A"-cclib"; A"-lc++"]);
   | _ ->
     ()