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: 33b8830a8524
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 11d26c797fb4
Choose a head ref
  • 5 commits
  • 7 files changed
  • 4 contributors

Commits on May 23, 2018

  1. Merge remote-tracking branch 'upstream/master' into ios-mini-staging

    @Ericson2314
    Ericson2314 committed May 23, 2018
    Configuration menu
    Copy the full SHA
    e5175fb View commit details
    Browse the repository at this point in the history

Commits on May 24, 2018

  1. llvm and clang 6: factor out compiler-rt, fix libstdcxxStdenv sanitiz… 

    …er headers

Build compiler-rt separate from llvm and clang, and just add as an extra
library in the wrapper.
    @Ralith @Ericson2314
    Ralith authored and Ericson2314 committed May 24, 2018
    Configuration menu
    Copy the full SHA
    16da44b View commit details
    Browse the repository at this point in the history

  2. tests.cc-wrapper: verify building with sanitizers

    @Ralith @Ericson2314
    Ralith authored and Ericson2314 committed May 24, 2018
    Configuration menu
    Copy the full SHA
    46eeef1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/staging' into compiler-rt

    @Ericson2314
    Ericson2314 committed May 24, 2018
    Configuration menu
    Copy the full SHA
    205fc55 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #39743 from Ralith/compiler-rt 

    llvm: factor out compiler-rt, fix libstdcxxStdenv sanitizer headers
    @Ericson2314
    Ericson2314 committed May 24, 2018
    Configuration menu
    Copy the full SHA
    11d26c7 View commit details
    Browse the repository at this point in the history