From d544c07968db16f73b40abe6c063dd9779b99ab1 Mon Sep 17 00:00:00 2001
From: Anutosh Bhat <andersonbhat491@gmail.com>
Date: Thu, 16 Jul 2026 13:46:49 +0530
Subject: [PATCH 1/6] Update clang-resource-headers version to 22.1.8

---
 .../recipes_emscripten/clang-resource-headers/recipe.yaml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
index 67d95d0d245..d6fdee34e3f 100644
--- a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
+++ b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
@@ -1,13 +1,13 @@
 context:
-  version: 21.1.8
-  major_version: 21
+  version: 22.1.8
+  major_version: 22
 
 package:
   name: clang-resource-headers
   version: ${{ version }}
 
 build:
-  number: 1
+  number: 0
   noarch: generic
 
 requirements:

From f5ef347c1c79aa7090ebe86e9d5f147ee2b5ec97 Mon Sep 17 00:00:00 2001
From: Anutosh Bhat <andersonbhat491@gmail.com>
Date: Thu, 16 Jul 2026 17:50:54 +0530
Subject: [PATCH 2/6] Add build script to recipe.yaml

---
 recipes/recipes_emscripten/clang-resource-headers/recipe.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
index d6fdee34e3f..10240360484 100644
--- a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
+++ b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
@@ -9,6 +9,8 @@ package:
 build:
   number: 0
   noarch: generic
+  script:
+    file: build.sh
 
 requirements:
   host:

From 9b422bc7ee9d0f6b4f1fcfafea5c18b34b4f2237 Mon Sep 17 00:00:00 2001
From: Anutosh Bhat <andersonbhat491@gmail.com>
Date: Thu, 16 Jul 2026 17:56:36 +0530
Subject: [PATCH 3/6] Update recipe.yaml

---
 recipes/recipes_emscripten/clang-resource-headers/recipe.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
index 10240360484..8ddbe76355a 100644
--- a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
+++ b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
@@ -9,8 +9,7 @@ package:
 build:
   number: 0
   noarch: generic
-  script:
-    file: build.sh
+  script: build.sh
 
 requirements:
   host:

From a2372f7214182e7be166aaaab59546e7bfabb606 Mon Sep 17 00:00:00 2001
From: Anutosh Bhat <andersonbhat491@gmail.com>
Date: Thu, 16 Jul 2026 17:57:00 +0530
Subject: [PATCH 4/6] Update build.sh

---
 .../clang-resource-headers/build.sh                   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/recipes/recipes_emscripten/clang-resource-headers/build.sh b/recipes/recipes_emscripten/clang-resource-headers/build.sh
index 8b9d7d9c7e2..b5c970eedc4 100644
--- a/recipes/recipes_emscripten/clang-resource-headers/build.sh
+++ b/recipes/recipes_emscripten/clang-resource-headers/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-STAGING_DIR="$PWD/staging"
-SRC_DIR="${PREFIX}/lib/clang"
+SRC_ROOT="${HOST_PREFIX:-$PREFIX}"
+SRC_DIR="${SRC_ROOT}/lib/clang"
 DEST_DIR="${PREFIX}/lib/clang"
 
 if [ ! -d "$SRC_DIR" ]; then
@@ -10,10 +10,5 @@ if [ ! -d "$SRC_DIR" ]; then
     exit 1
 fi
 
-mkdir -p "$STAGING_DIR"
-cp -r "$SRC_DIR" "$STAGING_DIR/clang"
-
-rm -rf "$PREFIX"/*
-
 mkdir -p "$DEST_DIR"
-cp -r "$STAGING_DIR/clang/"* "$DEST_DIR"
+cp -a "$SRC_DIR/." "$DEST_DIR/"

From f42ef1b8e91e359e23f9e2b8ead5957c5c9b5355 Mon Sep 17 00:00:00 2001
From: Anutosh Bhat <andersonbhat491@gmail.com>
Date: Thu, 16 Jul 2026 18:00:35 +0530
Subject: [PATCH 5/6] Update build.sh

---
 .../recipes_emscripten/clang-resource-headers/build.sh   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/recipes/recipes_emscripten/clang-resource-headers/build.sh b/recipes/recipes_emscripten/clang-resource-headers/build.sh
index b5c970eedc4..f835940140e 100644
--- a/recipes/recipes_emscripten/clang-resource-headers/build.sh
+++ b/recipes/recipes_emscripten/clang-resource-headers/build.sh
@@ -4,11 +4,18 @@ set -e
 SRC_ROOT="${HOST_PREFIX:-$PREFIX}"
 SRC_DIR="${SRC_ROOT}/lib/clang"
 DEST_DIR="${PREFIX}/lib/clang"
+STAGING_DIR="${PWD}/staging"
 
 if [ ! -d "$SRC_DIR" ]; then
     echo "ERROR: $SRC_DIR does not exist"
     exit 1
 fi
 
+mkdir -p "$STAGING_DIR/clang"
+cp -a "$SRC_DIR/." "$STAGING_DIR/clang/"
+
+# Start from an empty prefix so the restored headers are packaged as new content.
+find "$PREFIX" -mindepth 1 -maxdepth 1 -exec rm -rf {} +
+
 mkdir -p "$DEST_DIR"
-cp -a "$SRC_DIR/." "$DEST_DIR/"
+cp -a "$STAGING_DIR/clang/." "$DEST_DIR/"

From cafcdd31f1fbb1b6de1679ffc08709aad3cad36b Mon Sep 17 00:00:00 2001
From: Anutosh Bhat <andersonbhat491@gmail.com>
Date: Thu, 16 Jul 2026 18:03:34 +0530
Subject: [PATCH 6/6] Update build script format in recipe.yaml

---
 recipes/recipes_emscripten/clang-resource-headers/recipe.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
index 8ddbe76355a..10240360484 100644
--- a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
+++ b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml
@@ -9,7 +9,8 @@ package:
 build:
   number: 0
   noarch: generic
-  script: build.sh
+  script:
+    file: build.sh
 
 requirements:
   host: