Fix windows build fail, use nicer style for callgraph-dot, cleanup bo…

…otstrap script
CloakerSmoker · Jun 22, 2024 · dcc78a8 · dcc78a8
1 parent c177c7b
commit dcc78a8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/build/linux_compiler.elf b/build/linux_compiler.elf
diff --git a/build/windows_compiler.exe b/build/windows_compiler.exe
diff --git a/src/compiler/Parser/ASTVisitor.rlx b/src/compiler/Parser/ASTVisitor.rlx
@@ -241,6 +241,9 @@ struct ASTVisitor {
 				this->OnFunction(ImplementationMethod)
 			}
 		}
+		else if (Target->IsImported) {
+			; No destinations to visit
+		}
 		else if !(Target->HasFullDefinition) {
 			Target~>Context->Error("Function is declared but never defined")
 		}

diff --git a/src/compiler/Parser/CallGraph.rlx b/src/compiler/Parser/CallGraph.rlx
@@ -140,6 +140,8 @@ class CallGraph derives INew {
 
     define void DumpAllDot() {
         Print("digraph G {\n")
+        Print("\toverlap = false;\n")
+        Print("\tsplines = true;\n")
 
         i32 Count := this->Functions->Count()
 

diff --git a/tools/bootstrap.py b/tools/bootstrap.py
@@ -67,7 +67,7 @@ def use_compiler(new):
 if args.release:
 	print('Building for release')
 
-compile_command_format += ' ' + ' '.join(sys.argv[2:])
+compile_command_format += ' ' #+ ' '.join(sys.argv[2:])
 
 safe_compiler = path_join(bin_dir, f'{running_on.lower()}_compiler.{platform_extension}')
 
@@ -142,7 +142,9 @@ def use_compiler(new):
 for platform, extension in all_platforms:
     output = path_join(bin_dir, f'{platform}_new_compiler.{extension}')
     use_compiler(safe_compiler)
-    command = compile_command_format.format(output) + ' --elf --debug --' + platform
+    command = compile_command_format.format(output) + ' --debug --' + platform
+
+    #print(command)
 
     result = subprocess.run(command, cwd=cwd, shell=True, capture_output=True)
     stderr_text = result.stderr.decode('UTF-8')