Merge pull request #166977 from peperunas/clangMultiStdenv-fix

clangMultiStdenv: expose lib64 and lib separately in sysroot
This commit is contained in:
John Ericson 2022-04-05 12:21:33 -04:00 committed by GitHub
commit f712cdd62e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,9 +19,9 @@ let
lib = gcc_multi_sysroot;
};
} ''
mkdir -p $out/lib/gcc
mkdir -p $out/lib{,64}/gcc
ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/
ln -s ${combine gcc64}/lib/gcc/* $out/lib64/gcc/
ln -s ${combine gcc32}/lib/gcc/* $out/lib/gcc/
# XXX: This shouldn't be needed, clang just doesn't look for "i686-unknown"
ln -s $out/lib/gcc/i686-unknown-linux-gnu $out/lib/gcc/i686-pc-linux-gnu