diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-09-23 00:00:24 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-09-23 00:00:24 -0700 |
| commit | 800a4a6cebf363c8ba3d1fcfff55db8bfb71f731 (patch) | |
| tree | 566a2b9995048fb457bda97db04f8d5d5c5d50be /build.zig | |
| parent | fc88d36daea40b69690186730ae7f2a5296585a9 (diff) | |
| download | zig-800a4a6cebf363c8ba3d1fcfff55db8bfb71f731.tar.gz zig-800a4a6cebf363c8ba3d1fcfff55db8bfb71f731.zip | |
eliminate dependency of libzigcpp.a on libzigstage1.a
This allows us to create a build of self-hosted with LLVM extensions
enabled but without the stage1 backend.
Diffstat (limited to 'build.zig')
| -rw-r--r-- | build.zig | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -270,7 +270,7 @@ fn fileExists(filename: []const u8) !bool { fn addCppLib(b: *Builder, lib_exe_obj: anytype, cmake_binary_dir: []const u8, lib_name: []const u8) void { lib_exe_obj.addObjectFile(fs.path.join(b.allocator, &[_][]const u8{ cmake_binary_dir, - "zig_cpp", + "zigcpp", b.fmt("{}{}{}", .{ lib_exe_obj.target.libPrefix(), lib_name, lib_exe_obj.target.staticLibSuffix() }), }) catch unreachable); } @@ -352,7 +352,7 @@ fn findLLVM(b: *Builder, llvm_config_exe: []const u8) !LibraryDep { fn configureStage2(b: *Builder, exe: anytype, ctx: Context, need_cpp_includes: bool) !void { exe.addIncludeDir("src"); exe.addIncludeDir(ctx.cmake_binary_dir); - addCppLib(b, exe, ctx.cmake_binary_dir, "zig_cpp"); + addCppLib(b, exe, ctx.cmake_binary_dir, "zigcpp"); assert(ctx.lld_include_dir.len != 0); exe.addIncludeDir(ctx.lld_include_dir); { |