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: ef55e4b525e4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6fc356243235
Choose a head ref
  • 11 commits
  • 4 files changed
  • 3 contributors

Commits on Aug 25, 2020

  1. gcc: Fix building libgccjit on darwin, using strip -x

    The default `strip` invocation tries to strip global symbols from the
    library, and refuses because those are indirect symbol table
    references.
    antifuchs committed Aug 25, 2020
    Copy the full SHA
    038e86f View commit details
    Browse the repository at this point in the history
  2. emacs: Use stdenv.libc instead of .glibc

    The latter doesn't exist on Darwin (and, presumably, other targets as
    well). This change allows emacsGcc from emacs-overlay to attempt to
    build where previously, the derivation would error out.
    antifuchs committed Aug 25, 2020
    Copy the full SHA
    0d15ea9 View commit details
    Browse the repository at this point in the history
  3. gcc: On darwin, adjust IDs of installed .so files also

    Turns out that libgccjit gets installed as a .so file, which the gcc
    builder.sh didn't change: It only touched .dylib files; that means
    that anything linking in libgccjit.so would receive an "Image not
    found" error at load time.
    
    With this change, we invoke `install_name_tool` on .so files too,
    adjusting their dynamic linker ID, so that they too can be found.
    antifuchs committed Aug 25, 2020
    Copy the full SHA
    1759959 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. emacs: Fix paths to bintools on Darwin

    This changes PATH such that the correct linker can be found to
    construct .eln files at runtime.
    antifuchs committed Aug 30, 2020
    Copy the full SHA
    861f270 View commit details
    Browse the repository at this point in the history
  2. emacs: Set native-comp library path as linker flags instead

    Since Darwin's linker does not understand LIBRARY_PATH, we have to set
    the library path as explicit linker flags: This requires a very recent
    feature/native-comp emacs revision, but it runs on Darwin and
    correctly compiles files at runtime.
    antifuchs committed Aug 30, 2020
    Copy the full SHA
    a891ae4 View commit details
    Browse the repository at this point in the history
  3. gcc: Only use strip -x if building libgccjit on darwin

    It's not necessary to use strip -x otherwise, so let's just use it for
    the JIT library.
    antifuchs committed Aug 30, 2020
    Copy the full SHA
    41e34e7 View commit details
    Browse the repository at this point in the history
  4. emacs: Use stdenv.cc.libc instead of plain .libc

    This is the portable way to address the system-appropriate libc,
    better than conditionalizing by (darwin/GNU) system or using either
    one.
    antifuchs committed Aug 30, 2020
    Copy the full SHA
    ad7a3fb View commit details
    Browse the repository at this point in the history
  5. emacs: Use stdenv's bintools instead of clang

    This way, we don't have to drag clang or binutils/binutils-wrapped
    into the emacs closure, and can instead rely on using the correct one
    for the platform we're running on.
    
    Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
    antifuchs and matthewbauer committed Aug 30, 2020
    Copy the full SHA
    3384837 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. emacs: use -B flags for native compilation dependencies

    The -B flag to gcc (and libgccjit) allows us to specify where it can
    find things it needs to correctly compile code (both programs and
    libraries) without adjusting any environmental flags: So, no need to
    wrap the program for a PATH entry containing binutils, and no need to
    explicitly pass a linker path anymore.
    antifuchs committed Aug 31, 2020
    Copy the full SHA
    6ad323d View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2020

  1. emacs: use -B flags for native compilation dependencies

    The -B flag to gcc (and libgccjit) allows us to specify where it can
    find things it needs to correctly compile code (both programs and
    libraries) without adjusting any environmental flags: So, no need to
    wrap the program for a PATH entry containing binutils, and no need to
    explicitly pass a linker path anymore.
    antifuchs committed Sep 2, 2020
    2
    Copy the full SHA
    04fffd6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #94637 from antifuchs/gccemacs-on-darwin

    emacs: Make gccemacs build on darwin
    adisbladis committed Sep 2, 2020
    Copy the full SHA
    6fc3562 View commit details
    Browse the repository at this point in the history