Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gcc darwin fixes #18327

Closed
wants to merge 6 commits into from
Closed

gcc darwin fixes #18327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45cd1ea
gcc: --enable-bootstrap on Darwin
matthewbauer Sep 1, 2016
f2e753a
gcc: fix gmp, mpfr includes
matthewbauer Sep 5, 2016
cf004ae
gcc: add --with-native-system-header-dir for clang
matthewbauer Sep 6, 2016
f760e98
gcc4.5: allow empty libc-ldflags
matthewbauer Sep 14, 2016
c7e0fbc
gcc4.6: remove from tree
matthewbauer Sep 14, 2016
8610a34
gcc: use special native system headers for darwin
matthewbauer Sep 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions pkgs/development/compilers/gcc/4.5/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,28 +332,26 @@ stdenv.mkDerivation ({
#
# Likewise, the LTO code doesn't find zlib.

CPATH = concatStrings
(intersperse ":" (map (x: "${x.dev or x}/include")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]
++ optional (libpthread != null) libpthread
++ optional (libpthreadCross != null) libpthreadCross

# On GNU/Hurd glibc refers to Mach & Hurd
# headers.
++ optionals (libcCross != null &&
hasAttr "propagatedBuildInputs" libcCross)
libcCross.propagatedBuildInputs)));

LIBRARY_PATH = concatStrings
(intersperse ":" (map (x: x + "/lib")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]
++ optional (libpthread != null) libpthread)));
CPATH = makeSearchPathOutput "dev" "include" ([]
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]
++ optional (libpthread != null) libpthread
++ optional (libpthreadCross != null) libpthreadCross

# On GNU/Hurd glibc refers to Mach & Hurd
# headers.
++ optionals (libcCross != null &&
hasAttr "propagatedBuildInputs" libcCross)
libcCross.propagatedBuildInputs);

LIBRARY_PATH = makeLibraryPath ([]
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]
++ optional (libpthread != null) libpthread);

EXTRA_TARGET_CFLAGS =
if cross != null && libcCross != null then [
Expand Down
262 changes: 0 additions & 262 deletions pkgs/development/compilers/gcc/4.6/builder.sh
View file
Open in desktop

This file was deleted.

Loading