3 files changed, 69 insertions, 13 deletions
diff --git a/tools/common/target_detect.h b/tools/common/target_detect.h
new file mode 100644
index 00000000..995ab6a4
--- /dev/null
+++ b/tools/common/target_detect.h
@@ -0,0 +1,66 @@
+/*
+ * MRustC - Rust Compiler
+ * - By John Hodge (Mutabah/thePowersGang)
+ *
+ * common/target_detect.h
+ * - Auto-magical host target detection
+ */
+#pragma once
+
+// - Windows (MSVC)
+#ifdef _MSC_VER
+# if defined(_WIN64)
+#  define DEFAULT_TARGET_NAME "x86_64-windows-msvc"
+# else
+#  define DEFAULT_TARGET_NAME "x86-windows-msvc"
+# endif
+// - Linux
+#elif defined(__linux__)
+# if defined(__amd64__)
+#  define DEFAULT_TARGET_NAME "x86_64-linux-gnu"
+# elif defined(__aarch64__)
+#  define DEFAULT_TARGET_NAME "aarch64-linux-gnu"
+# elif defined(__arm__)
+#  define DEFAULT_TARGET_NAME "arm-linux-gnu"
+# elif defined(__i386__)
+#  define DEFAULT_TARGET_NAME "i586-linux-gnu"
+# else
+#  warning "Unable to detect a suitable default target (linux-gnu)"
+# endif
+// - MinGW
+#elif defined(__MINGW32__)
+# if defined(_WIN64)
+#  define DEFAULT_TARGET_NAME "x86_64-windows-gnu"
+# else
+#  define DEFAULT_TARGET_NAME "i586-windows-gnu"
+# endif
+// - NetBSD
+#elif defined(__NetBSD__)
+# if defined(__amd64__)
+#  define DEFAULT_TARGET_NAME "x86_64-unknown-netbsd"
+# else
+#  warning "Unable to detect a suitable default target (NetBSD)"
+# endif
+// - OpenBSD
+#elif defined(__OpenBSD__)
+# if defined(__amd64__)
+#  define DEFAULT_TARGET_NAME "x86_64-unknown-openbsd"
+# elif defined(__aarch64__)
+#  define DEFAULT_TARGET_NAME "aarch64-unknown-openbsd"
+# elif defined(__arm__)
+#  define DEFAULT_TARGET_NAME "arm-unknown-openbsd"
+# elif defined(__i386__)
+#  define DEFAULT_TARGET_NAME "i686-unknown-openbsd"
+# else
+#  warning "Unable to detect a suitable default target (OpenBSD)"
+# endif
+// - Apple devices
+#elif defined(__APPLE__)
+# define DEFAULT_TARGET_NAME "x86_64-apple-macosx"
+// - Unknown
+#else
+# warning "Unable to detect a suitable default target"
+#endif
+#ifndef DEFAULT_TARGET_NAME
+# define DEFAULT_TARGET_NAME	""
+#endif
diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp
index 21d8d809..42e19552 100644
--- a/tools/minicargo/build.cpp
+++ b/tools/minicargo/build.cpp
@@ -51,18 +51,8 @@ extern int _putenv_s(const char*, const char*);
 #else
 # define EXESUF ""
 #endif
-#ifdef _WIN32
-# ifdef _MSC_VER
-#  define HOST_TARGET "x86_64-windows-msvc"
-# elif defined(__MINGW32__)
-#  define HOST_TARGET "x86_64-windows-gnu"
-# else
-# endif
-#elif defined(__NetBSD__)
-# define HOST_TARGET "x86_64-unknown-netbsd"
-#else
-# define HOST_TARGET "x86_64-unknown-linux-gnu"
-#endif
+#include <target_detect.h>	// tools/common/target_detect.h
+#define HOST_TARGET	DEFAULT_TARGET_NAME
 
 /// Class abstracting access to the compiler
 class Builder
diff --git a/tools/minicargo/manifest.cpp b/tools/minicargo/manifest.cpp
index 6e2bf451..687c3e2a 100644
--- a/tools/minicargo/manifest.cpp
+++ b/tools/minicargo/manifest.cpp
@@ -9,7 +9,7 @@
 #include <cctype>   // toupper
 #include "repository.h"
 
-
+// TODO: Extract this from the target at runtime
 #ifdef _WIN32
 # define TARGET_NAME    "i586-windows-msvc"
 # define CFG_UNIX   false