diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-03-27 22:35:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 22:35:13 -0400 |
| commit | 107b5196f65c4e77c6c61ff830d6eb7de8b8842b (patch) | |
| tree | 1993c71221ff70dc6abacb3c360b03909fd5ca89 /src/analyze.cpp | |
| parent | 33819ecfbcde6a96262c4ec5cb38e3228ead83c7 (diff) | |
| parent | a25874108470f97c5c58d72b2df49a9085c79b2e (diff) | |
| download | zig-107b5196f65c4e77c6c61ff830d6eb7de8b8842b.tar.gz zig-107b5196f65c4e77c6c61ff830d6eb7de8b8842b.zip | |
Merge pull request #4827 from ziglang/zig-cpp
support compiling and linking c++ code
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index 77d3f33331..df7bcdf9de 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -7756,10 +7756,14 @@ LinkLib *create_link_lib(Buf *name) { LinkLib *add_link_lib(CodeGen *g, Buf *name) { bool is_libc = buf_eql_str(name, "c"); + bool is_libcpp = buf_eql_str(name, "c++") || buf_eql_str(name, "c++abi"); if (is_libc && g->libc_link_lib != nullptr) return g->libc_link_lib; + if (is_libcpp && g->libcpp_link_lib != nullptr) + return g->libcpp_link_lib; + for (size_t i = 0; i < g->link_libs_list.length; i += 1) { LinkLib *existing_lib = g->link_libs_list.at(i); if (buf_eql_buf(existing_lib->name, name)) { @@ -7772,6 +7776,8 @@ LinkLib *add_link_lib(CodeGen *g, Buf *name) { if (is_libc) g->libc_link_lib = link_lib; + if (is_libcpp) + g->libcpp_link_lib = link_lib; return link_lib; } |