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: df7e518568e3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 86c879d3befb
Choose a head ref
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Sep 13, 2017

  1. cctools: Add patch for extra flag for sierra hack 

    Patch is drawn from [1], a back-port of [2].

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.

[1]: https://github.com/obsidiansystems/cctools-port/tree/libs-normalize-17.03
[2]: tpoechtrager/cctools-port#34
    @Ericson2314
    Ericson2314 committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    2c6ab8a View commit details
    Browse the repository at this point in the history

  2. 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.

In addition to the script, we also patch ld-wrapper to respect `.dylib`
and `.so` alike. In a future version of nixpkgs, this can be so enabled
by defaut. Newer nixpkgs will probably do this by default.
    @Ericson2314
    Ericson2314 committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    c5b655a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #29096 from obsidiansystems/appease-sierra-linker 

    cc-wrapper: More intelligent sierra hack
    @Ericson2314
    Ericson2314 committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    86c879d View commit details
    Browse the repository at this point in the history