Merge branch 'master' into dependabot/github_actions/actions/checkout-4

tweag · Nov 6, 2023 · ecb9971 · ecb9971
2 parents 95f488c + f730ff8
commit ecb9971
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: cancel running workflows
-        uses: styfle/cancel-workflow-action@0.11.0
+        uses: styfle/cancel-workflow-action@0.12.0
         with:
           access_token: ${{ github.token }}
   test-nixpkgs:

diff --git a/toolchains/cc/cc.nix b/toolchains/cc/cc.nix
@@ -143,6 +143,12 @@ pkgs.runCommand "bazel-${cc.orignalName or cc.name}-toolchain"
         | xargs -0 -r realpath -ms
     }
     CXX_BUILTIN_INCLUDE_DIRECTORIES=($({
+      if is_compiler_option_supported -print-resource-dir; then
+        resource_dir="$( $cc -print-resource-dir )"
+        if [ -d "$resource_dir/share" ]; then
+          echo "$resource_dir/share"
+        fi
+      fi
       include_dirs_for c
       include_dirs_for c++
       if is_compiler_option_supported -fno-canonical-system-headers; then

diff --git a/toolchains/go/go.nix b/toolchains/go/go.nix
@@ -21,7 +21,7 @@ let
     paths = [ goAttr ];
     postBuild = ''
       touch $out/ROOT
-      ln -s $out/share/go/{api,doc,lib,misc,pkg,src} $out/
+      ln -s $out/share/go/{api,doc,lib,misc,pkg,src,go.env} $out/
     '';
   } // {
     version = getVersion goAttr;