From 642256f9ba580de65121215ff76b4d8498e18607 Mon Sep 17 00:00:00 2001 From: Zachary Pierson Date: Sun, 2 Apr 2017 18:46:31 -0500 Subject: [PATCH] I accidentally left debug stuff (like abs paths) in! Whoops! --- src/ir_print.c | 4 ---- src/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/ir_print.c b/src/ir_print.c index 9eec81fe8..4c696a666 100644 --- a/src/ir_print.c +++ b/src/ir_print.c @@ -1396,7 +1396,6 @@ void ir_print_proc(irFileBuffer *f, irModule *m, irProcedure *proc) { if(is_main_proc) for(int i=0;imodule->min_dep_map.entries.count;i++) { Entity *value = proc->module->min_dep_map.entries.e[i].value; - //printf("using: %.*s\n", LIT(proc->module->min_dep_map.entries.e[i].value->token.string)); if(value == NULL) continue; if(str_eq(str_lit("args"), value->token.string)) { uses_args = true; @@ -1404,9 +1403,6 @@ void ir_print_proc(irFileBuffer *f, irModule *m, irProcedure *proc) { } } - //bool uses_args = map_entity_get(&proc->module->min_dep_map, hash_pointer(entity_of_ident(proc->module->info, ast_ident(&fake_file, make_token_ident(str_lit("args")))))) == NULL; - //printf("uses_args: %d", (int)uses_args); - // TODO(zangent): THIS IS AN UGLY HACK // I _SERIOUSLY_ need to change this system, because this is just disgraceful. diff --git a/src/main.c b/src/main.c index 17ea379a0..ccc2b4c3b 100644 --- a/src/main.c +++ b/src/main.c @@ -261,7 +261,7 @@ int main(int argc, char **argv) { #if defined(GB_SYSTEM_WINDOWS) // For more passes arguments: http://llvm.org/docs/Passes.html exit_code = system_exec_command_line_app("llvm-opt", false, - "\"%.*sbin/opt\" \"%s\" -o \"%.*s.bc\" " + "\"%.*sbin/opt\" \"%s\" -o \"%.*s\".bc " "-mem2reg " "-memcpyopt " "-die " @@ -278,7 +278,7 @@ int main(int argc, char **argv) { // NOTE(zangent): This is separate because it seems that LLVM tools are packaged // with the Windows version, while they will be system-provided on MacOS and GNU/Linux exit_code = system_exec_command_line_app("llvm-opt", false, - "/usr/local/opt/llvm/bin/opt \"%s\" -o \"%.*s\".bc " + "opt \"%s\" -o \"%.*s\".bc " "-mem2reg " "-memcpyopt " "-die " @@ -365,7 +365,7 @@ int main(int argc, char **argv) { timings_start_section(&timings, str_lit("llvm-llc")); // For more arguments: http://llvm.org/docs/CommandGuide/llc.html exit_code = system_exec_command_line_app("llc", false, - "/usr/local/opt/llvm/bin/llc \"%.*s.bc\" -filetype=obj -O%d " + "llc \"%.*s.bc\" -filetype=obj -O%d " "%.*s " // "-debug-pass=Arguments " "", @@ -424,7 +424,7 @@ int main(int argc, char **argv) { } #if defined(GB_SYSTEM_OSX) - linker = "/usr/bin/ld"; + linker = "ld"; #else // TODO(zangent): Figure out how to make ld work on Linux. // It probably has to do with including the entire CRT, but