zig: upgrade to 0.6.0 #85183
Merged
zig: upgrade to 0.6.0 #85183
+39
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrewrk
approved these changes
Apr 13, 2020
Co-Authored-By: Andrew Kelley <andrew@ziglang.org>
cole-h
reviewed
Apr 13, 2020
Comment on lines
23
to
28
| patches = [ ./llvm10_polly.patch ]; | ||
|
|
||
| postPatch = '' | ||
| export llvm_extras=-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so | ||
| substituteAllInPlace CMakeLists.txt | ||
| ''; |
There was a problem hiding this comment.
I think something like this should work (will also need to add substituteAll to the args):
patches = [
(substituteAll {
src = ./llvm10_polly.patch;
llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so";
})
];
andrewrk
approved these changes
Apr 13, 2020
|
Why does it keep re-requesting my review? |
cole-h
approved these changes
Apr 13, 2020
There was a problem hiding this comment.
LGTM. ldd $(which zig) also shows LLVMPolly.so, so my suggestion doesn't appear to have screwed anything up ^^. Built and ran the "Hello World" example just fine.
[5 built, 10 copied (907.4 MiB), 119.7 MiB DL]
https://github.com/NixOS/nixpkgs/pull/85183
1 package built:
zig
|
just for future reference, updates commit messages are always like See https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes |
|
@andrewrk Build fails on darwin: /private/var/folders/wf/qxrs82v946n91pb5s71n3dy80000gp/T/nix-build-zig-0.6.0.drv-0/source/src/os.cpp:1105:9: error: use of undeclared identifier 'futimens'
if (futimens(file, times) == -1) {
^
1 error generated.
make[2]: *** [CMakeFiles/zigcompiler.dir/build.make:304: CMakeFiles/zigcompiler.dir/src/os.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/Makefile2:225: CMakeFiles/zigcompiler.dir/all] Error 2
make: *** [Makefile:150: all] Error 2
builder for '/nix/store/b7w0k884rcg5f0nlwm1jahxazgiillbw-zig-0.6.0.drv' failed with exit code 2
error: build of '/nix/store/b7w0k884rcg5f0nlwm1jahxazgiillbw-zig-0.6.0.drv' failedMy macOS version: $ sw_vers -productVersion
10.13.6According to https://ziglang.org/#Support-Table, macOS 10.13+ is supported. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
See Zig 0.6.0 release notes
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)