Unverified Commit 6bccf90e authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #267717 from Artturin/atomicstest

parents 2fc368a8 a1921375

pkgs/test/cc-wrapper/atomics.cc

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#include <atomic>

#include <cstdint>



int main()

{

  std::atomic_int x = {0};

  return !std::atomic_is_lock_free(&x);

}

pkgs/test/cc-wrapper/default.nix

+10 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ let 
  );

  staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";

  emulator = stdenv.hostPlatform.emulator buildPackages;

  libcxxStdenvSuffix = lib.optionalString (stdenv.cc.libcxx != null) "-libcxx";

  isCxx = stdenv.cc.libcxx != null;

  libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx";

in stdenv.mkDerivation {

  pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}";

  version = stdenv.cc.version;
@@ -37,6 +38,14 @@ in stdenv.mkDerivation { 
    $CXX -o include-cxxabi ${./include-cxxabi.cc}

    ${emulator} ./include-cxxabi



    # cxx doesn't have libatomic.so

    ${lib.optionalString (!isCxx) ''

      # https://github.com/NixOS/nixpkgs/issues/91285

      echo "checking whether libatomic.so can be linked... " >&2

      $CXX -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"}

      $READELF -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2

    ''}



    ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''

      echo "checking whether compiler can build with CoreFoundation.framework... " >&2

      mkdir -p foo/lib

pkgs/test/default.nix

+19 −17
Original line number Diff line number Diff line
@@ -39,41 +39,43 @@ with pkgs; 
      name = "cc-wrapper-supported";

      builtGCC =

        let

          names = lib.pipe (attrNames gccTests) ([

            (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.cc))

          inherit (lib) filterAttrs;

          sets = lib.pipe gccTests ([

            (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc))

            # Broken

            (filter (n: n != "gcc49Stdenv"))

            (filter (n: n != "gccMultiStdenv"))

            (filterAttrs (n: _: n != "gcc49Stdenv"))

            (filterAttrs (n: _: n != "gccMultiStdenv"))

          ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [

            # fails with things like

            # ld: warning: ld: warning: object file (trunctfsf2_s.o) was built for newer macOS version (11.0) than being linked (10.5)

            # ld: warning: ld: warning: could not create compact unwind for ___fixunstfdi: register 20 saved somewhere other than in frame

            (filter (n: n != "gcc11Stdenv"))

            (filterAttrs (n: _: n != "gcc11Stdenv"))

          ]);

        in

        toJSON (lib.genAttrs names (name: { name = pkgs.${name};  }));

        toJSON sets;



      builtLLVM =

        let

          names = lib.pipe (attrNames llvmTests) ([

            (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.stdenv.cc))

            (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.libcxxStdenv.cc))

          inherit (lib) filterAttrs;

          sets = lib.pipe llvmTests ([

            (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc))

            (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc))



            # libcxxStdenv broken

            # fix in https://github.com/NixOS/nixpkgs/pull/216273

          ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [

            # libcxx does not build for some reason on aarch64-linux

            (filter (n: n != "llvmPackages_7"))

            (filterAttrs (n: _: n != "llvmPackages_7"))

          ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [

            (filter (n: n != "llvmPackages_5"))

            (filter (n: n != "llvmPackages_6"))

            (filter (n: n != "llvmPackages_7"))

            (filter (n: n != "llvmPackages_8"))

            (filter (n: n != "llvmPackages_9"))

            (filter (n: n != "llvmPackages_10"))

            (filterAttrs (n: _: n != "llvmPackages_5"))

            (filterAttrs (n: _: n != "llvmPackages_6"))

            (filterAttrs (n: _: n != "llvmPackages_7"))

            (filterAttrs (n: _: n != "llvmPackages_8"))

            (filterAttrs (n: _: n != "llvmPackages_9"))

            (filterAttrs (n: _: n != "llvmPackages_10"))

          ]);

        in

        toJSON (lib.genAttrs names (name: { stdenv = pkgs.${name}.stdenv; libcxx = pkgs.${name}.libcxxStdenv;  }));

        toJSON sets;

        buildCommand = ''

          touch $out

        '';