Remove Windows cross compile patch (#685)

Author: mcbarton

.github/workflows/emscripten.yml

@@ -269,6 +269,13 @@ jobs:
 
         cd llvm-project
         # Build
+        mkdir native_build
+        cd native_build
+        cmake -DLLVM_ENABLE_PROJECTS=clang -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release -G Ninja ../llvm/
+        cmake --build . --target llvm-tblgen clang-tblgen --parallel $(nproc --all)
+        $env:PWD_DIR= $PWD.Path
+        $env:NATIVE_DIR="$env:PWD_DIR/bin/"
+        cd ..
         mkdir build
         if ( "${{ matrix.cling }}" -imatch "On" )
         {
@@ -295,23 +302,21 @@ jobs:
                         -DLLVM_BUILD_TOOLS=OFF                          `
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
+                        -DLLVM_NATIVE_TOOL_DIR="$env:NATIVE_DIR" 		    `
                 ..\llvm
           emmake make clang cling lld gtest_main
         }
         else
         {
           cp -r ..\patches\llvm\emscripten-clang${{ matrix.clang-runtime }}*
-          cp -r ..\patches\llvm\Windows-emscripten-clang${{ matrix.clang-runtime }}*
           #FIXME: Apply patches without hardcoding
           if ( "${{ matrix.clang-runtime }}" -imatch "19" )
           {
-            git apply -v Windows-emscripten-clang19-1-CrossCompile.patch
             git apply -v emscripten-clang19-2-shift-temporary-files-to-tmp-dir.patch
             git apply -v emscripten-clang19-3-remove-zdefs.patch
           }
           elseif ( "${{ matrix.clang-runtime }}" -imatch "20" )
           {
-            git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
             git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
           }
           cd build
@@ -336,6 +341,7 @@ jobs:
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
                         -G Ninja `
+                        -DLLVM_NATIVE_TOOL_DIR="$env:NATIVE_DIR" 		          `
                         ..\llvm
           emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm
         }

Emscripten-build-instructions.md

@@ -63,8 +63,6 @@ On Windows execute the following
 ```powershell
 cd .\llvm-project\
 cp -r ..\patches\llvm\emscripten-clang20*
-cp -r ..\patches\llvm\Windows-emscripten-clang20*
-git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
 git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
 ```
 
@@ -108,6 +106,13 @@ emmake make lldWasm -j $(nproc --all)
 or executing
 
 ```powershell
+mkdir native_build
+cd native_build
+cmake -DLLVM_ENABLE_PROJECTS=clang -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release -G Ninja ../llvm/
+cmake --build . --target llvm-tblgen clang-tblgen --parallel $(nproc --all)
+$env:PWD_DIR= $PWD.Path
+$env:NATIVE_DIR="$env:PWD_DIR/bin/"
+cd ..
 mkdir build
 cd build
 emcmake cmake -DCMAKE_BUILD_TYPE=Release `
@@ -129,6 +134,7 @@ emcmake cmake -DCMAKE_BUILD_TYPE=Release `
                         -DLLVM_BUILD_TOOLS=OFF                          `
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
+                        -DLLVM_NATIVE_TOOL_DIR="$env:NATIVE_DIR"        `
                         -G Ninja `
                         ..\llvm
 emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm

docs/Emscripten-build-instructions.rst

@@ -82,8 +82,6 @@ On Windows execute the following
 
    cd .\llvm-project\
    cp -r ..\patches\llvm\emscripten-clang20*
-   cp -r ..\patches\llvm\Windows-emscripten-clang20*
-   git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
    git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
 
 We are now in a position to build an emscripten build of llvm by executing the following on Linux
@@ -128,6 +126,13 @@ or executing
 
 .. code:: powershell
 
+   mkdir native_build
+   cd native_build
+   cmake -DLLVM_ENABLE_PROJECTS=clang -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release -G Ninja ../llvm/
+   cmake --build . --target llvm-tblgen clang-tblgen --parallel $(nproc --all)
+   $env:PWD_DIR= $PWD.Path
+   $env:NATIVE_DIR="$env:PWD_DIR/bin/"
+   cd ..
    mkdir build
    cd build
    emcmake cmake -DCMAKE_BUILD_TYPE=Release `
@@ -149,6 +154,7 @@ or executing
                         -DLLVM_BUILD_TOOLS=OFF                          `
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
+                        -DLLVM_NATIVE_TOOL_DIR="$env:NATIVE_DIR" 		    `
                         -G Ninja `
                         ..\llvm
    emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm