From bbbe04c2e6bd36bb8b25e960628e5551f4c130be Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Thu, 5 Sep 2024 02:13:35 +0200
Subject: [PATCH] Use external make_toolchain.sh script plus other improvements

---
 .github/workflows/run.yml | 46 +++++++++++++++++++--------------------
 include/features.h        |  7 ++++++
 2 files changed, 29 insertions(+), 24 deletions(-)
 create mode 100644 include/features.h

diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index c409409..649939b 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -1,45 +1,43 @@
 name: Install libstdc++ headers
-on: [push, workflow_dispatch]
+
+on: [push]
+
 jobs:
   install-headers:
     runs-on: ubuntu-latest
+    container: archlinux:latest
+
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install build-essential -y
+        run: pacman --noconfirm -Syu && pacman --needed --noconfirm -S base-devel git autoconf automake wget
 
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Git config
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
-      - name: Download GCC source code
-        uses: actions/checkout@v3
-        with:
-            repository: gcc-mirror/gcc
-            path: gcc
-
-      - name: Configure libstdc++
+      - name: Build toolchain
         run: |
-          cd gcc/libstdc++-v3/
-          mkdir build && cd build
-          ../configure --prefix=/ --disable-multilib --disable-tls --disable-nls --disable-hosted-libstdcxx --disable-libstdcxx-verbose --disable-libstdcxx-threads --disable-libstdcxx-filesystem-ts --disable-libstdcxx-backtrace
-
-      - name: Build and install libstdc++
-        run: DESTDIR=$(pwd)/dest/ make -C gcc/libstdc++-v3/build/ install-data
+          set -ex
+          wget https://gist.github.com/mintsuki/233faa49819aa91d7d2f8502ceaa94fe/raw/27565ee6baf7fa03105bab3fe6c3e50efa022558/make_toolchain.sh
+          chmod +x ./make_toolchain.sh
+          TARGET="x86_64-elf" ./make_toolchain.sh
 
       - name: Move headers
-        run: rm -rf include && mv dest/include/c++/*/ include
-
-      - name: Cleanup
-        run: rm -rf gcc dest
+        run: |
+          set -ex
+          mv ./include/features.h ./
+          rm -rf include && mv toolchain/include/c++/* include
+          mv ./features.h ./include/
 
       - name: Push
         run: |
-          git config user.name 'ilobilo'
-          git config user.email 'ilobilo@users.noreply.github.com'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/ilobilo/libstdcxx-headers.git
+          set -ex
+          git config user.name 'mintsuki'
+          git config user.email 'mintsuki@users.noreply.github.com'
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/osdev0/libstdcxx-headers.git
           git fetch --all
-          git add .
+          git add include
           git commit -m "Upload headers [ci skip]"
           git push origin master
diff --git a/include/features.h b/include/features.h
new file mode 100644
index 0000000..680609d
--- /dev/null
+++ b/include/features.h
@@ -0,0 +1,7 @@
+#ifndef FEATURES_H
+#define FEATURES_H
+
+#define __GLIBC_PREREQ(maj, min) 0
+#define __cpp_lib_out_ptr 0
+
+#endif // FEATURES_H