Commit 1554dd9697b77b4fe4a309247982c3e29048f124 | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-11-02 00:07:43-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-11-02 00:54:34-04:00
log	1554dd9697b77b4fe4a309247982c3e29048f124
tree	f1ed649ac17a98dfb49067e04ea0c169cb34a725
parent	5c97aff627394439089267132a6c86f5e6162f92
signature	Commit is signed but in an unrecognized format.

support building static self hosted compiler on macos

 * add a --system-linker-hack command line parameter to work around
   poor LLD macho code. See #1535
 * build.zig correctly handles static as well as dynamic dependencies
   when building the self hosted compiler.
   - no more unnecessary libxml2 dependency
   - a static build on macos produces a completely static self-hosted
     compiler for macos (except for libSystem as intended).

6 files changed, 122 insertions(+), 41 deletions(-)

build.zig
src
std
- build.zig

build.zig+84-38

 @@ -121,12 +121,23 @@ pub fn build(b: *Builder) !void {
     test_step.dependOn(docs_step);
 }
-fn dependOnLib(lib_exe_obj: var, dep: LibraryDep) void {
+fn dependOnLib(b: *Builder, lib_exe_obj: var, dep: LibraryDep) void {
     for (dep.libdirs.toSliceConst()) |lib_dir| {
         lib_exe_obj.addLibPath(lib_dir);
     }
+    const lib_dir = os.path.join(b.allocator, dep.prefix, "lib") catch unreachable;
     for (dep.system_libs.toSliceConst()) |lib| {
-        lib_exe_obj.linkSystemLibrary(lib);
+        const static_bare_name = if (mem.eql(u8, lib, "curses"))
+            ([]const u8)("libncurses.a")
+        else
+            b.fmt("lib{}.a", lib);
+        const static_lib_name = os.path.join(b.allocator, lib_dir, static_bare_name) catch unreachable;
+        const have_static = fileExists(static_lib_name) catch unreachable;
+        if (have_static) {
+            lib_exe_obj.addObjectFile(static_lib_name);
+        } else {
+            lib_exe_obj.linkSystemLibrary(lib);
+        }
     }
     for (dep.libs.toSliceConst()) |lib| {
         lib_exe_obj.addObjectFile(lib);
 @@ -136,12 +147,23 @@ fn dependOnLib(lib_exe_obj: var, dep: LibraryDep) void {
     }
 }
+fn fileExists(filename: []const u8) !bool {
+    os.File.access(filename) catch |err| switch (err) {
+        error.PermissionDenied,
+        error.FileNotFound,
+        => return false,
+        else => return err,
+    };
+    return true;
+}
 fn addCppLib(b: *Builder, lib_exe_obj: var, cmake_binary_dir: []const u8, lib_name: []const u8) void {
     const lib_prefix = if (lib_exe_obj.target.isWindows()) "" else "lib";
     lib_exe_obj.addObjectFile(os.path.join(b.allocator, cmake_binary_dir, "zig_cpp", b.fmt("{}{}{}", lib_prefix, lib_name, lib_exe_obj.target.libFileExt())) catch unreachable);
 }
 const LibraryDep = struct.{
+    prefix: []const u8,
     libdirs: ArrayList([]const u8),
     libs: ArrayList([]const u8),
     system_libs: ArrayList([]const u8),
 @@ -149,21 +171,25 @@ const LibraryDep = struct.{
 };
 fn findLLVM(b: *Builder, llvm_config_exe: []const u8) !LibraryDep {
-    const libs_output = try b.exec([][]const u8.{
+    const shared_mode = try b.exec([][]const u8.{ llvm_config_exe, "--shared-mode" });
-        llvm_config_exe,
+    const is_static = mem.startsWith(u8, shared_mode, "static");
-        "--libs",
+    const libs_output = if (is_static)
-        "--system-libs",
+        try b.exec([][]const u8.{
-    });
+            llvm_config_exe,
-    const includes_output = try b.exec([][]const u8.{
+            "--libfiles",
-        llvm_config_exe,
+            "--system-libs",
-        "--includedir",
+        })
-    });
+    else
-    const libdir_output = try b.exec([][]const u8.{
+        try b.exec([][]const u8.{
-        llvm_config_exe,
+            llvm_config_exe,
-        "--libdir",
+            "--libs",
-    });
+        });
+    const includes_output = try b.exec([][]const u8.{ llvm_config_exe, "--includedir" });
+    const libdir_output = try b.exec([][]const u8.{ llvm_config_exe, "--libdir" });
+    const prefix_output = try b.exec([][]const u8.{ llvm_config_exe, "--prefix" });
     var result = LibraryDep.{
+        .prefix = mem.split(prefix_output, " \r\n").next().?,
         .libs = ArrayList([]const u8).init(b.allocator),
         .system_libs = ArrayList([]const u8).init(b.allocator),
         .includes = ArrayList([]const u8).init(b.allocator),
 @@ -244,10 +270,6 @@ fn nextValue(index: *usize, build_info: []const u8) []const u8 {
 }
 fn configureStage2(b: *Builder, exe: var, ctx: Context) !void {
-    // This is for finding /lib/libz.a on alpine linux.
-    // TODO turn this into -Dextra-lib-path=/lib option
-    exe.addLibPath("/lib");
     exe.setNoRoSegment(ctx.no_rosegment);
     exe.addIncludeDir("src");
 @@ -265,39 +287,63 @@ fn configureStage2(b: *Builder, exe: var, ctx: Context) !void {
         addCppLib(b, exe, ctx.cmake_binary_dir, "embedded_lld_coff");
         addCppLib(b, exe, ctx.cmake_binary_dir, "embedded_lld_lib");
     }
-    dependOnLib(exe, ctx.llvm);
+    dependOnLib(b, exe, ctx.llvm);
     if (exe.target.getOs() == builtin.Os.linux) {
-        const libstdcxx_path_padded = try b.exec([][]const u8.{
+        try addCxxKnownPath(b, ctx, exe, "libstdc++.a",
-            ctx.cxx_compiler,
+            \\Unable to determine path to libstdc++.a
-            "-print-file-name=libstdc++.a",
+            \\On Fedora, install libstdc++-static and try again.
-        });
+            \\
-        const libstdcxx_path = mem.split(libstdcxx_path_padded, "\r\n").next().?;
+        );
-        if (mem.eql(u8, libstdcxx_path, "libstdc++.a")) {
-            warn(
-                \\Unable to determine path to libstdc++.a
-                \\On Fedora, install libstdc++-static and try again.
-                \\
-            );
-            return error.RequiredLibraryNotFound;
-        }
-        exe.addObjectFile(libstdcxx_path);
         exe.linkSystemLibrary("pthread");
     } else if (exe.target.isDarwin()) {
-        exe.linkSystemLibrary("c++");
+        if (addCxxKnownPath(b, ctx, exe, "libgcc_eh.a", "")) {
+            // Compiler is GCC.
+            try addCxxKnownPath(b, ctx, exe, "libstdc++.a", null);
+            exe.linkSystemLibrary("pthread");
+            // TODO LLD cannot perform this link.
+            // See https://github.com/ziglang/zig/issues/1535
+            exe.enableSystemLinkerHack();
+        } else |err| switch (err) {
+            error.RequiredLibraryNotFound => {
+                // System compiler, not gcc.
+                exe.linkSystemLibrary("c++");
+            },
+            else => return err,
+        }
     }
     if (ctx.dia_guids_lib.len != 0) {
         exe.addObjectFile(ctx.dia_guids_lib);
     }
-    if (exe.target.getOs() != builtin.Os.windows) {
-        exe.linkSystemLibrary("xml2");
-    }
     exe.linkSystemLibrary("c");
 }
+fn addCxxKnownPath(
+    b: *Builder,
+    ctx: Context,
+    exe: var,
+    objname: []const u8,
+    errtxt: ?[]const u8,
+) !void {
+    const path_padded = try b.exec([][]const u8.{
+        ctx.cxx_compiler,
+        b.fmt("-print-file-name={}", objname),
+    });
+    const path_unpadded = mem.split(path_padded, "\r\n").next().?;
+    if (mem.eql(u8, path_unpadded, objname)) {
+        if (errtxt) |msg| {
+            warn("{}", msg);
+        } else {
+            warn("Unable to determine path to {}\n", objname);
+        }
+        return error.RequiredLibraryNotFound;
+    }
+    exe.addObjectFile(path_unpadded);
+}
 const Context = struct.{
     cmake_binary_dir: []const u8,
     cxx_compiler: []const u8,

src/all_types.hpp+1

...	@@ -1731,6 +1731,7 @@ struct CodeGen {	...	@@ -1731,6 +1731,7 @@ struct CodeGen {
1731	bool generate_error_name_table;	1731	bool generate_error_name_table;
1732	bool enable_cache;	1732	bool enable_cache;
1733	bool enable_time_report;	1733	bool enable_time_report;
		1734	bool system_linker_hack;
1734		1735
1735	//////////////////////////// Participates in Input Parameter Cache Hash	1736	//////////////////////////// Participates in Input Parameter Cache Hash
1736	ZigList<LinkLib *> link_libs_list;	1737	ZigList<LinkLib *> link_libs_list;

src/link.cpp+13-2

 @@ -778,7 +778,8 @@ static bool darwin_version_lt(DarwinPlatform *platform, int major, int minor) {
 static void construct_linker_job_macho(LinkJob *lj) {
     CodeGen *g = lj->codegen;
-    lj->args.append("-error-limit=0");
+    // LLD MACH-O has no error limit option.
+    //lj->args.append("-error-limit=0");
     lj->args.append("-demangle");
     if (g->linker_rdynamic) {
 @@ -1007,7 +1008,17 @@ void codegen_link(CodeGen *g) {
     Buf diag = BUF_INIT;
     codegen_add_time_event(g, "LLVM Link");
-    if (!zig_lld_link(g->zig_target.oformat, lj.args.items, lj.args.length, &diag)) {
+    if (g->system_linker_hack && g->zig_target.os == OsMacOSX) {
+        Termination term;
+        ZigList<const char *> args = {};
+        for (size_t i = 1; i < lj.args.length; i += 1) {
+            args.append(lj.args.at(i));
+        }
+        os_spawn_process("ld", args, &term);
+        if (term.how != TerminationIdClean || term.code != 0) {
+            exit(1);
+        }
+    } else if (!zig_lld_link(g->zig_target.oformat, lj.args.items, lj.args.length, &diag)) {
         fprintf(stderr, "%s\n", buf_ptr(&diag));
         exit(1);
     }

src/main.cpp+4

src/os.cpp+1-1

...	@@ -103,7 +103,7 @@ static void os_spawn_process_posix(const char exe, ZigList<const char > &args,	...	@@ -103,7 +103,7 @@ static void os_spawn_process_posix(const char exe, ZigList<const char > &args,
103	}	103	}
104		104
105	pid_t pid;	105	pid_t pid;
106	int rc = posix_spawn(&pid, exe, nullptr, nullptr, const_cast<char const>(argv), environ);	106	int rc = posix_spawnp(&pid, exe, nullptr, nullptr, const_cast<char const>(argv), environ);
107	if (rc != 0) {	107	if (rc != 0) {
108	zig_panic("posix_spawn failed: %s", strerror(rc));	108	zig_panic("posix_spawn failed: %s", strerror(rc));
109	}	109	}

std/build.zig+19

...	@@ -836,6 +836,7 @@ pub const LibExeObjStep = struct.{	...	@@ -836,6 +836,7 @@ pub const LibExeObjStep = struct.{
836	assembly_files: ArrayList([]const u8),	836	assembly_files: ArrayList([]const u8),
837	packages: ArrayList(Pkg),	837	packages: ArrayList(Pkg),
838	build_options_contents: std.Buffer,	838	build_options_contents: std.Buffer,
		839	system_linker_hack: bool,
839		840
840	// C only stuff	841	// C only stuff
841	source_files: ArrayList([]const u8),	842	source_files: ArrayList([]const u8),
...	@@ -930,6 +931,7 @@ pub const LibExeObjStep = struct.{	...	@@ -930,6 +931,7 @@ pub const LibExeObjStep = struct.{
930	.disable_libc = true,	931	.disable_libc = true,
931	.build_options_contents = std.Buffer.initSize(builder.allocator, 0) catch unreachable,	932	.build_options_contents = std.Buffer.initSize(builder.allocator, 0) catch unreachable,
932	.c_std = Builder.CStd.C99,	933	.c_std = Builder.CStd.C99,
		934	.system_linker_hack = false,
933	};	935	};
934	self.computeOutFileNames();	936	self.computeOutFileNames();
935	return self;	937	return self;
...	@@ -965,6 +967,7 @@ pub const LibExeObjStep = struct.{	...	@@ -965,6 +967,7 @@ pub const LibExeObjStep = struct.{
965	.is_zig = false,	967	.is_zig = false,
966	.linker_script = null,	968	.linker_script = null,
967	.c_std = Builder.CStd.C99,	969	.c_std = Builder.CStd.C99,
		970	.system_linker_hack = false,
968		971
969	.root_src = undefined,	972	.root_src = undefined,
970	.verbose_link = false,	973	.verbose_link = false,
...	@@ -1162,6 +1165,10 @@ pub const LibExeObjStep = struct.{	...	@@ -1162,6 +1165,10 @@ pub const LibExeObjStep = struct.{
1162	self.disable_libc = disable;	1165	self.disable_libc = disable;
1163	}	1166	}
1164		1167
		1168	pub fn enableSystemLinkerHack(self: *LibExeObjStep) void {
		1169	self.system_linker_hack = true;
		1170	}
		1171
1165	fn make(step: *Step) !void {	1172	fn make(step: *Step) !void {
1166	const self = @fieldParentPtr(LibExeObjStep, "step", step);	1173	const self = @fieldParentPtr(LibExeObjStep, "step", step);
1167	return if (self.is_zig) self.makeZig() else self.makeC();	1174	return if (self.is_zig) self.makeZig() else self.makeC();
...	@@ -1338,6 +1345,9 @@ pub const LibExeObjStep = struct.{	...	@@ -1338,6 +1345,9 @@ pub const LibExeObjStep = struct.{
1338	if (self.no_rosegment) {	1345	if (self.no_rosegment) {
1339	try zig_args.append("--no-rosegment");	1346	try zig_args.append("--no-rosegment");
1340	}	1347	}
		1348	if (self.system_linker_hack) {
		1349	try zig_args.append("--system-linker-hack");
		1350	}
1341		1351
1342	try builder.spawnChild(zig_args.toSliceConst());	1352	try builder.spawnChild(zig_args.toSliceConst());
1343		1353
...	@@ -1646,6 +1656,7 @@ pub const TestStep = struct.{	...	@@ -1646,6 +1656,7 @@ pub const TestStep = struct.{
1646	object_files: ArrayList([]const u8),	1656	object_files: ArrayList([]const u8),
1647	no_rosegment: bool,	1657	no_rosegment: bool,
1648	output_path: ?[]const u8,	1658	output_path: ?[]const u8,
		1659	system_linker_hack: bool,
1649		1660
1650	pub fn init(builder: *Builder, root_src: []const u8) TestStep {	1661	pub fn init(builder: *Builder, root_src: []const u8) TestStep {
1651	const step_name = builder.fmt("test {}", root_src);	1662	const step_name = builder.fmt("test {}", root_src);
...	@@ -1665,6 +1676,7 @@ pub const TestStep = struct.{	...	@@ -1665,6 +1676,7 @@ pub const TestStep = struct.{
1665	.object_files = ArrayList([]const u8).init(builder.allocator),	1676	.object_files = ArrayList([]const u8).init(builder.allocator),
1666	.no_rosegment = false,	1677	.no_rosegment = false,
1667	.output_path = null,	1678	.output_path = null,
		1679	.system_linker_hack = false,
1668	};	1680	};
1669	}	1681	}
1670		1682
...	@@ -1747,6 +1759,10 @@ pub const TestStep = struct.{	...	@@ -1747,6 +1759,10 @@ pub const TestStep = struct.{
1747	self.exec_cmd_args = args;	1759	self.exec_cmd_args = args;
1748	}	1760	}
1749		1761
		1762	pub fn enableSystemLinkerHack(self: *TestStep) void {
		1763	self.system_linker_hack = true;
		1764	}
		1765
1750	fn make(step: *Step) !void {	1766	fn make(step: *Step) !void {
1751	const self = @fieldParentPtr(TestStep, "step", step);	1767	const self = @fieldParentPtr(TestStep, "step", step);
1752	const builder = self.builder;	1768	const builder = self.builder;
...	@@ -1851,6 +1867,9 @@ pub const TestStep = struct.{	...	@@ -1851,6 +1867,9 @@ pub const TestStep = struct.{
1851	if (self.no_rosegment) {	1867	if (self.no_rosegment) {
1852	try zig_args.append("--no-rosegment");	1868	try zig_args.append("--no-rosegment");
1853	}	1869	}
		1870	if (self.system_linker_hack) {
		1871	try zig_args.append("--system-linker-hack");
		1872	}
1854		1873
1855	try builder.spawnChild(zig_args.toSliceConst());	1874	try builder.spawnChild(zig_args.toSliceConst());
1856	}	1875	}

...	@@ -394,6 +394,7 @@ int main(int argc, char **argv) {	...	@@ -394,6 +394,7 @@ int main(int argc, char **argv) {
394	ZigList<const char *> test_exec_args = {0};	394	ZigList<const char *> test_exec_args = {0};
395	int runtime_args_start = -1;	395	int runtime_args_start = -1;
396	bool no_rosegment_workaround = false;	396	bool no_rosegment_workaround = false;
		397	bool system_linker_hack = false;
397		398
398	if (argc >= 2 && strcmp(argv[1], "build") == 0) {	399	if (argc >= 2 && strcmp(argv[1], "build") == 0) {
399	Buf zig_exe_path_buf = BUF_INIT;	400	Buf zig_exe_path_buf = BUF_INIT;
...	@@ -560,6 +561,8 @@ int main(int argc, char **argv) {	...	@@ -560,6 +561,8 @@ int main(int argc, char **argv) {
560	timing_info = true;	561	timing_info = true;
561	} else if (strcmp(arg, "--disable-pic") == 0) {	562	} else if (strcmp(arg, "--disable-pic") == 0) {
562	disable_pic = true;	563	disable_pic = true;
		564	} else if (strcmp(arg, "--system-linker-hack") == 0) {
		565	system_linker_hack = true;
563	} else if (strcmp(arg, "--test-cmd-bin") == 0) {	566	} else if (strcmp(arg, "--test-cmd-bin") == 0) {
564	test_exec_args.append(nullptr);	567	test_exec_args.append(nullptr);
565	} else if (arg[1] == 'L' && arg[2] != 0) {	568	} else if (arg[1] == 'L' && arg[2] != 0) {
...	@@ -893,6 +896,7 @@ int main(int argc, char **argv) {	...	@@ -893,6 +896,7 @@ int main(int argc, char **argv) {
893	g->verbose_llvm_ir = verbose_llvm_ir;	896	g->verbose_llvm_ir = verbose_llvm_ir;
894	g->verbose_cimport = verbose_cimport;	897	g->verbose_cimport = verbose_cimport;
895	codegen_set_errmsg_color(g, color);	898	codegen_set_errmsg_color(g, color);
		899	g->system_linker_hack = system_linker_hack;
896		900
897	for (size_t i = 0; i < lib_dirs.length; i += 1) {	901	for (size_t i = 0; i < lib_dirs.length; i += 1) {
898	codegen_add_lib_dir(g, lib_dirs.at(i));	902	codegen_add_lib_dir(g, lib_dirs.at(i));