Merge branch 'master' of https://github.com/odin-lang/Odin

2 files changed, 1 insertions, 7 deletions

diff --git a/src/checker.cpp b/src/checker.cpp
index be58538a6..d5d6bf5c3 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -1907,7 +1907,7 @@ void generate_minimum_dependency_set(Checker *c, Entity *start) {
 				array_add(&c->info.testing_procedures, e);
 			}
 		}
-	} else {
+	} else if (start != nullptr) {
 		start->flags |= EntityFlag_Used;
 		add_dependency_to_set(c, start);
 	}
diff --git a/src/main.cpp b/src/main.cpp
index b1fc8fd35..0897e5fa6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -875,12 +875,6 @@ bool parse_build_flags(Array<String> args) {
 							String path = value.value_string;
 							path = string_trim_whitespace(path);
 							if (is_build_flag_path_valid(path)) {
-								#if defined(GB_SYSTEM_WINDOWS)
-									String ext = path_extension(path);
-									if (ext == ".exe") {
-										path = substring(path, 0, string_extension_position(path));
-									}
-								#endif
 								build_context.out_filepath = path_to_full_path(heap_allocator(), path);
 							} else {
 								gb_printf_err("Invalid -out path, got %.*s\n", LIT(path));