diff dmd/mars.c @ 583:12bda38ea366

Fixed choosing default target machine without needing to link in targets.
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sun, 07 Sep 2008 17:44:25 -0700
parents 7824c21a58e3
children 29dc68c949b0
line wrap: on
line diff
--- a/dmd/mars.c	Sun Sep 07 16:16:10 2008 +0200
+++ b/dmd/mars.c	Sun Sep 07 17:44:25 2008 -0700
@@ -41,9 +41,6 @@
 
 void getenv_setargv(const char *envvar, int *pargc, char** *pargv);
 
-// llvmdc
-void findDefaultTarget();
-
 Global global;
 
 Global::Global()
@@ -753,7 +750,18 @@
     bool allowForceEndianness = false;
 
     if (global.params.llvmArch == 0) {
-        findDefaultTarget();
+    #if defined(__x86_64__) || defined(_M_X64)
+        global.params.llvmArch = "x86-64";
+    #elif defined(__i386__) || defined(_M_IX86)
+        global.params.llvmArch = "x86";
+    #elif defined(__ppc__) || defined(_M_PPC)
+        if (global.params.is64bit)
+            global.params.llvmArch = "ppc64";
+        else
+            global.params.llvmArch = "ppc32";
+    #else
+    #error
+    #endif
     }
 
     if (strcmp(global.params.llvmArch,"x86")==0) {