[MLton-commit] r6892

[Wesley Terpstra]

I'm not going to fix i386 PIC on darwin... unless they fix their assembler.
Just fallback to the C codegen for PIC.


----------------------------------------------------------------------

U   mlton/trunk/mlton/main/main.fun

----------------------------------------------------------------------

Modified: mlton/trunk/mlton/main/main.fun
===================================================================
--- mlton/trunk/mlton/main/main.fun	2008-09-24 17:58:30 UTC (rev 6891)
+++ mlton/trunk/mlton/main/main.fun	2008-09-24 18:07:59 UTC (rev 6892)
@@ -133,6 +133,8 @@
 fun hasCodegen (cg) =
    let
       datatype z = datatype Control.Target.arch
+      datatype z = datatype Control.Target.os
+      datatype z = datatype Control.Format.t
       datatype z = datatype Control.codegen
    in
       case !Control.Target.arch of
@@ -141,6 +143,11 @@
                     | _ => true)
        | X86 => (case cg of
                     amd64Codegen => false
+                  | x86Codegen => 
+                      (* Darwin PIC doesn't work *)
+                      !Control.Target.os <> Darwin orelse
+                      !Control.format = Executable orelse
+                      !Control.format = Archive
                   | _ => true)
        | _ => (case cg of
                   amd64Codegen => false