diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-05-10 16:38:37 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-05-10 17:31:54 -0700 |
| commit | 45415093c655d30ec226172695248fbf28941667 (patch) | |
| tree | 3c986224f6ee1c843b6f56c3c487f65809ff9a15 /src/Compilation.zig | |
| parent | 3997828a6176203b25b541c6e450f5e4bda82ce4 (diff) | |
| download | zig-45415093c655d30ec226172695248fbf28941667.tar.gz zig-45415093c655d30ec226172695248fbf28941667.zip | |
reduce the scope of this branch
* back out the changes to RunStep
* move the disabled test to the .cpp code and avoid a confusing
name-collision with the _LIBCPP macro prefix
* fix merge conflict with the edits to the same test that ensure global
initializers are called.
Now this branch is only concerned with single-threaded targets and
passing the correct macro defines to libc++.
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 3eb527b612..5e4ab0ec12 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -3815,7 +3815,7 @@ pub fn addCCArgs( if (comp.bin_file.options.single_threaded) { try argv.append("-D_LIBCPP_HAS_NO_THREADS"); - } else {} + } } if (comp.bin_file.options.link_libunwind) { |