Merge branch 'master' of 88.198.237.222:/git/m1-debian

[m1-debian] / gpu.sh

diff --git a/gpu.sh b/gpu.sh
index 3ad63e526243e8a8a9b854be255b16154d0419af..f6ee3f0fc85f50f6bde36307afcc7451d56d7767 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -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
@@ -14,12 +18,13 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard origin/gpu/rust-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/asahi-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
 )
 }
 
@@ -53,6 +58,6 @@ build_uboot()
 mkdir -p build
 cd build
 
-#build_linux
+build_linux
 build_m1n1
 build_uboot