diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-05-13 12:10:21 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-05-13 12:10:21 -0400 |
| commit | f3db3b3c1319e2e86bf5eabd2c2eaef58e4dd783 (patch) | |
| tree | 0df5ac1ae3cb5c7cddf30391666128a7a4cae264 /src/main.cpp | |
| parent | c1793d61061a112dc3d58c33ac0d3a1ebc8fb35e (diff) | |
| parent | a038ef3570caed01815173d95089e016fab3a050 (diff) | |
| download | zig-f3db3b3c1319e2e86bf5eabd2c2eaef58e4dd783.tar.gz zig-f3db3b3c1319e2e86bf5eabd2c2eaef58e4dd783.zip | |
Merge branch 'asm-cc' of https://github.com/LemonBoy/zig into LemonBoy-asm-cc
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5659624cb7..934c998435 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,7 +48,6 @@ static int print_full_usage(const char *arg0, FILE *file, int return_code) { " zen print zen of zig and exit\n" "\n" "Compile Options:\n" - " --assembly [source] add assembly file to build\n" " --c-source [options] [file] compile C source code\n" " --cache-dir [path] override the local cache directory\n" " --cache [auto|off|on] build in cache, print output path to stdout\n" @@ -428,7 +427,6 @@ int main(int argc, char **argv) { bool each_lib_rpath = false; ZigList<const char *> objects = {0}; ZigList<CFile *> c_source_files = {0}; - ZigList<const char *> asm_files = {0}; const char *test_filter = nullptr; const char *test_name_prefix = nullptr; size_t ver_major = 0; @@ -774,8 +772,6 @@ int main(int argc, char **argv) { break; } } - } else if (strcmp(arg, "--assembly") == 0) { - asm_files.append(argv[i]); } else if (strcmp(arg, "--cache-dir") == 0) { cache_dir = argv[i]; } else if (strcmp(arg, "-target") == 0) { @@ -971,14 +967,13 @@ int main(int argc, char **argv) { case CmdTranslateCUserland: case CmdTest: { - if (cmd == CmdBuild && !in_file && objects.length == 0 && asm_files.length == 0 && + if (cmd == CmdBuild && !in_file && objects.length == 0 && c_source_files.length == 0) { fprintf(stderr, "Expected at least one of these things:\n" " * Zig root source file argument\n" " * --object argument\n" - " * --assembly argument\n" " * --c-source argument\n"); return print_error_usage(arg0); } else if ((cmd == CmdTranslateC || cmd == CmdTranslateCUserland || @@ -1130,9 +1125,6 @@ int main(int argc, char **argv) { for (size_t i = 0; i < objects.length; i += 1) { codegen_add_object(g, buf_create_from_str(objects.at(i))); } - for (size_t i = 0; i < asm_files.length; i += 1) { - codegen_add_assembly(g, buf_create_from_str(asm_files.at(i))); - } } |