Fix resolve of crt objects on Linux and Mac.

Author: travisdoor

lib/bl/api/builtin/entry/module.yaml

@@ -7,12 +7,12 @@ x86_64-pc-windows-msvc:
 
 x86_64-pc-linux-gnu:
   linker_lib_path: "linux"
-  linker_opt: "-lentry $(gcc -print-file-name=crt1.o) $(gcc -print-file-name=crti.o) $(gcc -print-file-name=crtn.o)"
+  linker_opt: "-lentry"
 
 x86_64-unknown-linux-gnu:
   linker_lib_path: "linux"
-  linker_opt: "-lentry $(gcc -print-file-name=crt1.o) $(gcc -print-file-name=crti.o) $(gcc -print-file-name=crtn.o)"
+  linker_opt: "-lentry"
 
 arm64-apple-darwin:
   linker_lib_path: "darwin"
-  linker_opt: "-lentry $(clang -print-file-name=crt1.o) $(clang -print-file-name=crti.o) $(clang -print-file-name=crtn.o)"
+  linker_opt: "-lentry"

src/setup.c

@@ -110,26 +110,26 @@ bool setup(const str_t filepath, const char *triple) {
 }
 
 str_buf_t make_content(const struct context *ctx) {
-#define TEMPLATE                                                                                \
-	"# Automatically generated configuration file used by 'blc' compiler.\n"                    \
-	"# To generate new one use 'blc --configure' command.\n\n"                                  \
-	"# Compiler version, this should match the executable version 'blc --version'.\n"           \
-	"version: \"{str}\"\n\n"                                                                    \
+#define TEMPLATE \
+	"# Automatically generated configuration file used by 'blc' compiler.\n" \
+	"# To generate new one use 'blc --configure' command.\n\n" \
+	"# Compiler version, this should match the executable version 'blc --version'.\n" \
+	"version: \"{str}\"\n\n" \
 	"# Main API directory containing all modules and source files. This option is mandatory.\n" \
-	"lib_dir: \"{str}\"\n"                                                                      \
-	"\n"                                                                                        \
-	"# Current default environment configuration.\n"                                            \
-	"{s}:\n"                                                                                    \
-	"    # Platform operating system preload file (relative to 'lib_dir').\n"                   \
-	"    preload_file: \"{str}\"\n"                                                             \
-	"    # Optional path to the linker executable, 'lld' linker is used by default on some "    \
-	"platforms.\n"                                                                              \
-	"    linker_executable: \"{str}\"\n"                                                        \
-	"    # Linker flags and options used to produce executable binaries.\n"                     \
-	"    linker_opt_exec: \"{str}\"\n"                                                          \
-	"    # Linker flags and options used to produce shared libraries.\n"                        \
-	"    linker_opt_shared: \"{str}\"\n"                                                        \
-	"    # File system location where linker should lookup for dependencies.\n"                 \
+	"lib_dir: \"{str}\"\n" \
+	"\n" \
+	"# Current default environment configuration.\n" \
+	"{s}:\n" \
+	"    # Platform operating system preload file (relative to 'lib_dir').\n" \
+	"    preload_file: \"{str}\"\n" \
+	"    # Optional path to the linker executable, 'lld' linker is used by default on some " \
+	"platforms.\n" \
+	"    linker_executable: \"{str}\"\n" \
+	"    # Linker flags and options used to produce executable binaries.\n" \
+	"    linker_opt_exec: \"{str}\"\n" \
+	"    # Linker flags and options used to produce shared libraries.\n" \
+	"    linker_opt_shared: \"{str}\"\n" \
+	"    # File system location where linker should lookup for dependencies.\n" \
 	"    linker_lib_path: \"{str}\"\n\n"
 
 	str_buf_t tmp = get_tmp_str();
@@ -219,6 +219,25 @@ bool x86_64_pc_linux_gnu(struct context *ctx) {
 		}
 	}
 
+	// Resolve c runtime
+#define FIND_AND_APPEND_CRT(N) \
+	{ \
+		str_buf_t crt = execute("gcc -print-file-name=" N); \
+		if (!normalize_path(&crt)) { \
+			builder_error("C runtime not found on the system. Defaulting to '/usr/lib/" N "'."); \
+			str_buf_append(&runtime, make_str_from_c("/usr/lib/" N)); \
+		} else { \
+			str_buf_append_fmt(&runtime, "{str} ", crt); \
+		} \
+		put_tmp_str(crt); \
+	}
+
+	FIND_AND_APPEND_CRT("crt1.o");
+	FIND_AND_APPEND_CRT("crti.o");
+	FIND_AND_APPEND_CRT("crtn.o");
+
+#undef FIND_AND_APPEND_CRT
+
 	ctx->linker_opt_exec   = scprint(&ctx->cache, "{str} {str}", runtime, LINKER_OPT_EXEC);
 	ctx->linker_opt_shared = scprint(&ctx->cache, "{str}", LINKER_OPT_SHARED);
 	ctx->linker_lib_path   = scprint(&ctx->cache, "{str}", lib_paths);
@@ -371,6 +390,11 @@ static bool arm64_apple_darwin(struct context *ctx) {
 		str_buf_append_fmt(&optshared, "-macos_version_min {s32}.0 -ld_classic ", default_macos_min_version);
 	}
 
+	// Resolve c runtime
+	str_buf_append_fmt(&optexec, "{str}/usr/lib/crt1.o ", macos_sdk);
+	str_buf_append_fmt(&optexec, "{str}/usr/lib/crti.o ", macos_sdk);
+	str_buf_append_fmt(&optexec, "{str}/usr/lib/crtn.o ", macos_sdk);
+
 	str_buf_append(&optexec, LINKER_OPT_EXEC);
 	str_buf_append(&optshared, LINKER_OPT_SHARED);