Change -Oz -flto solution to be cmake configure

Author: mcbarton

.github/workflows/emscripten.yml

@@ -194,8 +194,11 @@ jobs:
                         -DLLVM_ENABLE_LIBPFM=OFF                        \
                         -DCLANG_BUILD_TOOLS=OFF                         \
                         -DLLVM_NATIVE_TOOL_DIR=$NATIVE_DIR 		\
+                        -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" \
+                        -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" \
+                        -DLLVM_ENABLE_LTO=Full \
                          ../llvm
-          EMCC_CFLAGS="-Oz -flto" emmake ninja clang cling lld gtest_main
+          emmake ninja clang cling lld gtest_main
         else
           # Apply patches
           llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -225,8 +228,11 @@ jobs:
                         -DCLANG_BUILD_TOOLS=OFF                         \
                         -G Ninja                                         \
                         -DLLVM_NATIVE_TOOL_DIR=$NATIVE_DIR 		\
+                        -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" \
+                        -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" \
+                        -DLLVM_ENABLE_LTO=Full \
                         ../llvm
-          EMCC_CFLAGS="-Oz -flto" emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm
+          emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm
         fi
         cd ../
         rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")
@@ -295,8 +301,10 @@ jobs:
                         -DLLVM_BUILD_TOOLS=OFF                          `
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
+                        -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" `
+                        -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" `
+                        -DLLVM_ENABLE_LTO=Full `
                 ..\llvm
-          $env:EMCC_CFLAGS="-Oz -flto"
           emmake make clang cling lld gtest_main
         }
         else
@@ -336,9 +344,11 @@ jobs:
                         -DLLVM_BUILD_TOOLS=OFF                          `
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
+                        -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" `
+                        -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" `
+                        -DLLVM_ENABLE_LTO=Full `
                         -G Ninja `
                         ..\llvm
-          $env:EMCC_CFLAGS="-Oz -flto"
           emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm
         }
         cd ..\

Emscripten-build-instructions.md

@@ -99,10 +99,13 @@ emcmake cmake -DCMAKE_BUILD_TYPE=Release \
                         -DLLVM_ENABLE_LIBPFM=OFF                        \
                         -DCLANG_BUILD_TOOLS=OFF                         \
                         -DLLVM_NATIVE_TOOL_DIR=$NATIVE_DIR              \
+                        -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" \
+                        -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" \
+                        -DLLVM_ENABLE_LTO=Full \
                         ../llvm
-EMCC_CFLAGS="-Oz -flto" emmake make libclang -j $(nproc --all)
-EMCC_CFLAGS="-Oz -flto" emmake make clangInterpreter clangStaticAnalyzerCore -j $(nproc --all)
-EMCC_CFLAGS="-Oz -flto" emmake make lldWasm -j $(nproc --all)
+emmake make libclang -j $(nproc --all)
+emmake make clangInterpreter clangStaticAnalyzerCore -j $(nproc --all)
+emmake make lldWasm -j $(nproc --all)
 ```
 
 or executing
@@ -130,10 +133,11 @@ emcmake cmake -DCMAKE_BUILD_TYPE=Release `
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
                         -G Ninja `
+                        -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" `
+                        -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" `
+                        -DLLVM_ENABLE_LTO=Full `
                         ..\llvm
-$env:EMCC_CFLAGS="-Oz -flto"
 emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm
-$env:EMCC_CFLAGS=""
 ```
 
 on Windows. Once this finishes building we need to take note of where we built our llvm build. This can be done by executing the following on Linux and osx

docs/Emscripten-build-instructions.rst

@@ -119,10 +119,13 @@ and osx
                  -DLLVM_ENABLE_LIBPFM=OFF                        \
                  -DCLANG_BUILD_TOOLS=OFF                         \
                  -DLLVM_NATIVE_TOOL_DIR=$NATIVE_DIR 		\
+                 -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" \
+                 -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" \
+                 -DLLVM_ENABLE_LTO=Full \
                  ../llvm
-   EMCC_CFLAGS="-Oz -flto" emmake make libclang -j $(nproc --all)
-   EMCC_CFLAGS="-Oz -flto" emmake make clangInterpreter clangStaticAnalyzerCore -j $(nproc --all)
-   EMCC_CFLAGS="-Oz -flto" emmake make lldWasm -j $(nproc --all)
+   emmake make libclang -j $(nproc --all)
+   emmake make clangInterpreter clangStaticAnalyzerCore -j $(nproc --all)
+   emmake make lldWasm -j $(nproc --all)
 
 or executing
 
@@ -150,10 +153,11 @@ or executing
                         -DLLVM_ENABLE_LIBPFM=OFF                        `
                         -DCLANG_BUILD_TOOLS=OFF                         `
                         -G Ninja `
+                        -DCMAKE_C_FLAGS_RELEASE="-Oz -g0" `
+                        -DCMAKE_CXX_FLAGS_RELEASE="-Oz -g0" `
+                        -DLLVM_ENABLE_LTO=Full `
                         ..\llvm
-   $env:EMCC_CFLAGS="-Oz -flto" 
    emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm
-   $env:EMCC_CFLAGS=""
 
 on Windows. Once this finishes building we need to take note of where we built our llvm build.
 This can be done by executing the following on Linux and osx