Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 87e39d444c34
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c2a3988d6c81
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 3, 2020

  1. zig: fix build 

    It looks like #88248 broke the
build for zig.

The error you get when building zig on the current master branch is:

```
Scanning dependencies of target zig_build_libstage2
: CommandLine Error: Option 'polly' registered more than once!
LLVM ERROR: inconsistency in registered CommandLine options
make[2]: *** [CMakeFiles/zig_build_libstage2.dir/build.make:77: CMakeFiles/zig_build_libstage2] Error 1
make[1]: *** [CMakeFiles/Makefile2:252: CMakeFiles/zig_build_libstage2.dir/all] Error 2
make: *** [Makefile:150: all] Error 2
```

The patch that added polly into some build args was likely necessary
only for LLVM 10.0.0 and when that was updated to 10.0.1 it stopped
working or became unnecessary. With this patch removed, zig builds fine
and passes the tests.
    @wjlroe
    wjlroe committed Aug 3, 2020
    Copy the full SHA
    d51340f View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge pull request #94559 from wjlroe/fix-zig-0.6.0 

    zig: fix build
    @marsam
    marsam committed Aug 4, 2020
    Copy the full SHA
    c2a3988 View commit details
    Browse the repository at this point in the history