diff --git a/recipes/recipes_emscripten/clang-resource-headers/build.sh b/recipes/recipes_emscripten/clang-resource-headers/build.sh index 8b9d7d9c7e2..f835940140e 100644 --- a/recipes/recipes_emscripten/clang-resource-headers/build.sh +++ b/recipes/recipes_emscripten/clang-resource-headers/build.sh @@ -1,19 +1,21 @@ #!/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" +STAGING_DIR="${PWD}/staging" if [ ! -d "$SRC_DIR" ]; then echo "ERROR: $SRC_DIR does not exist" exit 1 fi -mkdir -p "$STAGING_DIR" -cp -r "$SRC_DIR" "$STAGING_DIR/clang" +mkdir -p "$STAGING_DIR/clang" +cp -a "$SRC_DIR/." "$STAGING_DIR/clang/" -rm -rf "$PREFIX"/* +# 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 -r "$STAGING_DIR/clang/"* "$DEST_DIR" +cp -a "$STAGING_DIR/clang/." "$DEST_DIR/" diff --git a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml index 67d95d0d245..10240360484 100644 --- a/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml +++ b/recipes/recipes_emscripten/clang-resource-headers/recipe.yaml @@ -1,14 +1,16 @@ 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 + script: + file: build.sh requirements: host: