make builds cross compile to correct target if using the llvm triple …

…(--target) x86_64-apple-darwin16.1.0 which my sierra box with llvm 3.9 advertises
crystal-lang · Dec 12, 2016 · c5e1388 · c5e1388
1 parent 5818369
commit c5e1388
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/compiler/crystal/crystal_path.cr b/src/compiler/crystal/crystal_path.cr
@@ -21,7 +21,7 @@ module Crystal
         triple[0] = "i686"
       end
 
-      target = if triple.any?(&.includes?("macosx"))
+      target = if triple.any?(&.includes?("macosx")) || triple.any?(&.includes?("darwin"))
                  {triple[0], "macosx", "darwin"}.join('-')
                elsif triple.any?(&.includes?("freebsd"))
                  {triple[0], triple[1], "freebsd"}.join('-')

diff --git a/src/compiler/crystal/semantic/flags.cr b/src/compiler/crystal/semantic/flags.cr
@@ -23,7 +23,7 @@ class Crystal::Program
 
   private def parse_flags(flags_name)
     set = flags_name.map(&.downcase).to_set
-    set.add "darwin" if set.any?(&.starts_with?("macosx"))
+    set.add "darwin" if set.any?(&.starts_with?("macosx")) || set.any?(&.starts_with?("darwin"))
     set.add "freebsd" if set.any?(&.starts_with?("freebsd"))
     set.add "openbsd" if set.any?(&.starts_with?("openbsd"))
     set.add "x86_64" if set.any?(&.starts_with?("amd64"))