Commit 884d150408

Andrew Kelley <andrew@ziglang.org>
2020-02-20 04:09:05
stage1 main: fix cli parsing of architecture
1 parent c33cd37
Changed files (1)
src/main.cpp
@@ -978,20 +978,9 @@ static int main0(int argc, char **argv) {
 
     ZigTarget target;
     if ((err = target_parse_triple(&target, target_string, mcpu))) {
-        if (err == ErrorUnknownArchitecture && target.arch != ZigLLVM_UnknownArch) {
-            fprintf(stderr, "'%s' requires a sub-architecture. Try one of these:\n",
-                    target_arch_name(target.arch));
-            SubArchList sub_arch_list = target_subarch_list(target.arch);
-            size_t subarch_count = target_subarch_count(sub_arch_list);
-            for (size_t sub_i = 0; sub_i < subarch_count; sub_i += 1) {
-                ZigLLVM_SubArchType sub = target_subarch_enum(sub_arch_list, sub_i);
-                fprintf(stderr, "  %s%s\n", target_arch_name(target.arch), target_subarch_name(sub));
-            }
-            return print_error_usage(arg0);
-        } else {
-            fprintf(stderr, "invalid target: %s\n", err_str(err));
-            return print_error_usage(arg0);
-        }
+        fprintf(stderr, "invalid target: %s\n"
+                "See `%s targets` to display valid targets.\n", err_str(err), arg0);
+        return print_error_usage(arg0);
     }
     if (target_is_glibc(&target)) {
         target.glibc_version = heap::c_allocator.create<ZigGLibCVersion>();