diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-08-04 21:38:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-08-04 21:38:08 +0200 |
| commit | 01c2ba857590ca8d156682e478d297201b715ea2 (patch) | |
| tree | 132d524d390bbdf5f08a3b3d9e251ea82177909f /pkgs/development/compilers/swift | |
| parent | ccedb29f4b0b3a02f28be0a06cae480da2be432b (diff) | |
| parent | 8bbc202208d0a972e1a1a973f19b4ae0415bce4b (diff) | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/compilers/swift')
| -rw-r--r-- | pkgs/development/compilers/swift/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 36929209d598..c4144532c583 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -261,8 +261,8 @@ stdenv.mkDerivation { ''; buildPhase = '' - # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found - export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" + # explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib + export NIX_CFLAGS_COMPILE="$(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. # This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE" |