cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #149407 from cbrewster/cb-swift-fix-build-libuuid

Browse source 
swift: Fix test failure during build
This commit is contained in:
Bobby Rong 2021-12-23 10:00:45 +08:00 committed by GitHub
commit 6c3d903d2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/swift/default.nix
View file

@ -340,7 +340,7 @@ stdenv.mkDerivation {
# TODO: consider using stress-tester and integration-test. # TODO: consider using stress-tester and integration-test.
# Match the wrapped version of Swift to be installed. # Match the wrapped version of Swift to be installed.
export LIBRARY_PATH=${icu}/lib:${libgcc}/lib:${libuuid.out}/lib:$l export LIBRARY_PATH=${lib.makeLibraryPath [icu libgcc libuuid]}:$l
checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name} checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}
ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
@ -363,13 +363,13 @@ stdenv.mkDerivation {
--set CC $out/bin/clang \ --set CC $out/bin/clang \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]}
wrapProgram $out/bin/swiftc \ wrapProgram $out/bin/swiftc \
--set CC $out/bin/clang \ --set CC $out/bin/clang \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]}
''; '';
# Hack to avoid build and install directories in RPATHs. # Hack to avoid build and install directories in RPATHs.