pyrox.dev
Merge pull request #35695 from dtzWill/fix/swift-gcc7
swift: add include for <functional> (#35689)
authored by Will Dietz and committed by GitHub 5069ad2c e0c82dcd
+4
-2
pkgs/development/compilers/swift/default.nix
+4
-2
pkgs/development/compilers/swift/default.nix
···
145
145
url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff";
146
146
sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m";
147
147
};
148
-
149
148
in
150
149
stdenv.mkDerivation rec {
151
150
name = "swift-${version_friendly}";
···
247
246
# https://bugs.swift.org/browse/SR-5779
248
247
sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
249
248
249
+
# https://bugs.swift.org/browse/SR-4838
250
+
sed -i -e '30i#include <functional>' lldb/include/lldb/Utility/TaskPool.h
251
+
250
252
substituteInPlace clang/lib/Driver/ToolChains.cpp \
251
253
--replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
252
254
' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
···
287
289
288
290
# TODO: Use wrappers to get these on the PATH for swift tools, instead
289
291
ln -s ${clang}/bin/* $out/bin/
290
-
ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar
292
+
ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar
291
293
292
294
wrapProgram $out/bin/swift \
293
295
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \