From 559e1e7e01cd5ecf42a0157b1a2bf0ef53ad312c Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Mon, 2 Aug 2010 13:26:35 -0700
Subject: [PATCH] Use a better heuristic to determine whether we're on a Mac,
 issue 69

---
 src/boot/driver/main.ml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/boot/driver/main.ml b/src/boot/driver/main.ml
index 9af7ee0b7a7..9049546cca7 100644
--- a/src/boot/driver/main.ml
+++ b/src/boot/driver/main.ml
@@ -8,11 +8,9 @@ let _ =
 
 let (targ:Common.target) =
   match Sys.os_type with
-      "Unix" ->
-        (* FIXME (issue #69): this is an absurd heuristic. *)
-        if Sys.file_exists "/System/Library"
-        then MacOS_x86_macho
-        else Linux_x86_elf
+      "Unix" when Unix.system "test `uname -s` = 'Darwin'" = Unix.WEXITED 0 ->
+        MacOS_x86_macho
+    | "Unix" -> Linux_x86_elf
     | "Win32" -> Win32_x86_pe
     | "Cygwin" -> Win32_x86_pe
     | _ -> Linux_x86_elf