Unverified Commit 07494a46 authored by Adam Joseph's avatar Adam Joseph Committed by GitHub
Browse files

Merge pull request #243615 from amjoseph-nixpkgs/pr/gcc/fix-m68k 

gcc: if isM68k, look for libgcc_s.so.2 (instead of .so.1)
parents dbd0bd32 895c2434

pkgs/development/compilers/gcc/common/libgcc.nix

+10 −3
Original line number Diff line number Diff line
@@ -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" ];
@@ -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:
@@ -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}

    '');

}))))

pkgs/test/cross/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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