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

Jump to bottom

gcc: if isM68k, look for libgcc_s.so.2 (instead of .so.1) #243615

Merged
2 commits merged into from Jul 19, 2023
Merged

gcc: if isM68k, look for libgcc_s.so.2 (instead of .so.1) #243615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a35e169
gcc: if isM68k, look for libgcc_s.so.2 (instead of .so.1)
Jul 1, 2023
895c243
test.cross.sanity: add pkgs.pkgsCross.m68k.stdenv
Jul 1, 2023
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
13 changes: 10 additions & 3 deletions pkgs/development/compilers/gcc/common/libgcc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ lib.optional (lib.versionAtLeast version "11.0")
enableShared
;

# For some reason libgcc_s.so has major-version "2" on m68k but
# "1" everywhere else. Might be worth changing this to "*".
libgcc_s-version-major =
if targetPlatform.isM68k
then "2"
else "1";

in
(pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
Expand Down Expand Up @@ -75,9 +82,9 @@ in
# move libgcc from lib to its own output (libgcc)
mkdir -p $libgcc/lib
mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/
mv $lib/${targetPlatformSlash}lib/libgcc_s.so.1 $libgcc/lib/
mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/
ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/
ln -s $libgcc/lib/libgcc_s.so.1 $lib/${targetPlatformSlash}lib/
ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/
''
#
# Nixpkgs ordinarily turns dynamic linking into pseudo-static linking:
Expand Down Expand Up @@ -134,7 +141,7 @@ in
# another eliminates the ability to make these queries.
#
+ ''
patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.1
patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.${libgcc_s-version-major}
'');
}))))

1 change: 1 addition & 0 deletions pkgs/test/cross/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ let
pkgs.pkgsLLVM.stdenv
pkgs.pkgsStatic.bash
pkgs.pkgsCross.arm-embedded.stdenv
pkgs.pkgsCross.m68k.stdenv
pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc
#pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc
pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv
Expand Down