aboutsummaryrefslogtreecommitdiff
path: root/build.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2018-12-29 12:49:23 -0500
committerGitHub <noreply@github.com>2018-12-29 12:49:23 -0500
commitd8b6fa9134e247658bb98155ba2e4243cd335b1b (patch)
tree55887d1fb589b00a6ec4ed9d51bc38b9821f4699 /build.zig
parentc464ecf3bf6d764ad06a20f10efc386e26fb7fa2 (diff)
parent2e08bd6be4a3b472fcaa69f0cb7683b269cdacdd (diff)
downloadzig-d8b6fa9134e247658bb98155ba2e4243cd335b1b.tar.gz
zig-d8b6fa9134e247658bb98155ba2e4243cd335b1b.zip
Merge pull request #1859 from mgxm/fbsd2
Progress towards tier 1 support for FreeBSD x86_64
Diffstat (limited to 'build.zig')
-rw-r--r--build.zig7
1 files changed, 5 insertions, 2 deletions
diff --git a/build.zig b/build.zig
index e411ae8b21..16185eebf4 100644
--- a/build.zig
+++ b/build.zig
@@ -293,11 +293,14 @@ fn configureStage2(b: *Builder, exe: var, ctx: Context) !void {
try addCxxKnownPath(b, ctx, exe, "libstdc++.a",
\\Unable to determine path to libstdc++.a
\\On Fedora, install libstdc++-static and try again.
- \\
);
exe.linkSystemLibrary("pthread");
- } else if (exe.target.isDarwin() or exe.target.isFreeBSD()) {
+ } else if (exe.target.isFreeBSD()) {
+ try addCxxKnownPath(b, ctx, exe, "libc++.a", null);
+ exe.linkSystemLibrary("pthread");
+ }
+ else if (exe.target.isDarwin()) {
if (addCxxKnownPath(b, ctx, exe, "libgcc_eh.a", "")) {
// Compiler is GCC.
try addCxxKnownPath(b, ctx, exe, "libstdc++.a", null);