From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Thu, 27 Oct 2022 09:50:33 +0000 (+0200)
Subject: Merge branch 'master' of a.gmvl.de:/git/m1-debian
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/f413f308ca170f0170c82c4c1db6f1fa9a550fd3?ds=sidebyside;hp=-c

Merge branch 'master' of a.gmvl.de:/git/m1-debian
---

f413f308ca170f0170c82c4c1db6f1fa9a550fd3
diff --combined gpu.sh
index 61508fd,15719b7..d82b045
--- a/gpu.sh
+++ b/gpu.sh
@@@ -1,13 -1,9 +1,13 @@@
 -#!/bin/bash
 +#!/usr/bin/env bash
  
  # SPDX-License-Identifier: MIT
  
 -set -x
 -set -e
 +set -o errexit
 +set -o nounset
 +set -o pipefail
 +set -o xtrace
 +
 +cd "$(dirname "$0")"
  
  unset LC_CTYPE
  unset LANG
@@@ -18,12 -14,13 +18,13 @@@ build_linux(
          test -d linux || git clone https://github.com/AsahiLinux/linux
          cd linux
          git fetch -a -t
-         git reset --hard origin/asahi-wip;
-         curl -sL https://tg.st/u/e633ae8c7e2f16d7bc845a0695e583a836d94846e1c33da182216e565c3769c4.config > .config
-         make olddefconfig
-         make -j `nproc` V=0 > /dev/null
-         sudo make modules_install
-         sudo make install
+         git reset --hard origin/gpu/rust-wip;
+         source "$HOME/.cargo/env"
+         curl -sL https://tg.st/u/3007a82fe2f3ef7d91945e1cb3e5a167f8d6b0550ecb67850d1cd85f3efa112e.config > .config
+         make LLVM=-14 olddefconfig
+         make LLVM=-14 -j `nproc` V=0 > /dev/null
+         sudo make LLVM=-14 modules_install
+         sudo make LLVM=-14 install
  )
  }