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: 5d9bd57c635a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 800cb8ae7142
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 12, 2018

  1. cctools: Make assert meta.broken instead

    This more politely expresses the same thing
    Ericson2314 committed Apr 12, 2018
    Copy the full SHA
    01e1722 View commit details
    Browse the repository at this point in the history
  2. cctools: Add alternative source for sierra hack

    Source master rebase of my [PR #34].
    
    Eventually, we might consider doing something for GNU binutils too, in
    order that we switch (the normal) ld-wrapper to always use this to
    leverage ld to resolve libraries, rather than faking it in bash.
    
    [PR #34]: tpoechtrager/cctools-port#34
    Ericson2314 committed Apr 12, 2018
    Copy the full SHA
    1001311 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2018

  1. cc-wrapper: Utilize patched cctools ld for more robust macOS Sierra hack

    Also fix numberous bugs, such as:
    
     - Not getting confused on more flags taking file arguments.
    
     - Ensuring children reexport their children, but the original
       binary/library doesn't.
    
     - Not spawning children when it turns out we just dynamically link
       under the threshold but our total number of inputs exceeeds it.
    
     - Children were always named `libunnamed-*`, when that name was
       supposed to be the last resort only.
    
    ld-wrapper's own RPATH check hardcodes `.so`, but darwin uses `.dylib`
    *and* (in practice due to lousy build systems) `.so`. We don't care
    however because we never inject `--rpath` like that in practice on
    Darwin. Hopefully someday we won't on linux either.
    Ericson2314 committed Apr 13, 2018
    Copy the full SHA
    1a72330 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #38881 from obsidiansystems/sierra-hack

    cc-wrapper: More intelligent sierra hack
    Ericson2314 committed Apr 13, 2018
    Copy the full SHA
    800cb8a View commit details
    Browse the repository at this point in the history