Rfactor

Author: tstellar

.github/workflows/release-binaries.yml

@@ -160,24 +160,12 @@ jobs:
           #libxml2_prefix="/c/vcpkg/packages/libxml2_x64-windows-static/"
           libxml2_prefix="/s/libxml-install/"
           target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
-          target_cmake_flags="$target_cmake_flags -DLLVM_ENABLE_LIBXML2=FORCE_ON"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_LLVM_ENABLE_LIBXML2=FORCE_ON"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_LLVM_ENABLE_LIBXML2=FORCE_ON"
           #target_cmake_flags="$target_cmake_flags -DCMAKE_PREFIX_PATH=$libxml2_prefix"
           target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_CMAKE_PREFIX_PATH=$libxml2_prefix"
           target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_CMAKE_PREFIX_PATH=$libxml2_prefix"
           # This is required to enable static linking
-          # target_cmake_flags="$target_cmake_flags -DLIBXML2_DEFINITIONS=-DLIBXML_STATIC"
-          #target_cmake_flags="$target_cmake_flags -DCMAKE_CXX_FLAGS=-DLIBXML_STATIC"
-          #target_cmake_flags="$target_cmake_flags -DCMAKE_C_FLAGS=-DLIBXML_STATIC"
           target_cmake_flags="$target_cmake_flags -DLIBXML2_LIBRARIES=$libxml2_prefix/lib/libxml2s.lib"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_LIBXML2_DEFINITIONS=-DLIBXML_STATIC"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_CMAKE_CXX_FLAGS=-DLIBXML_STATIC"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_CMAKE_C_FLAGS=-DLIBXML_STATIC"
           target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_LIBXML2_LIBRARIES=$libxml2_prefix/lib/libxml2s.lib"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_CMAKE_CXX_FLAGS=-DLIBXML_STATIC"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_CMAKE_C_FLAGS=-DLIBXML_STATIC"
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_LIBXML2_DEFINITIONS=-DLIBXML_STATIC"
           target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_LIBXML2_LIBRARIES=$libxml2_prefix/lib/libxml2s.lib"
           target_cmake_flags="$target_cmake_flags -DLIBXML2_INCLUDE_DIR=$libxml2_prefix/include/libxml2"
           target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_LIBXML2_INCLUDE_DIR=$libxml2_prefix/include/libxml2"
@@ -300,7 +288,7 @@ jobs:
         #ls -l /c/vcpkg/packages/libxml2_x64-windows-static/include/libxml2/libxml
         # There were some issues on the ARM64 MacOS runners with trying to build x86 object,
         # so we need to set some extra cmake flags to disable this.
-        cmake  --debug-trycompile -G Ninja -S llvm -B ${{ steps.setup-stage.outputs.build-prefix }}/build \
+        cmake  -G Ninja -S llvm -B ${{ steps.setup-stage.outputs.build-prefix }}/build \
             ${{ needs.prepare.outputs.target-cmake-flags }} \
             -C clang/cmake/caches/Release.cmake \
             -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"

clang/cmake/caches/Release.cmake

@@ -37,6 +37,8 @@ if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
   set_instrument_and_final_stage_var(LLDB_RELOCATABLE_PYTHON "1" STRING)
   set_instrument_and_final_stage_var(LLDB_EMBED_PYTHON_HOME "OFF" BOOL)
   set_instrument_and_final_stage_var(LLVM_ENABLE_LIBXML2 "FORCE_ON" STRING)
+  # This is required in order to statically link LIBXML2
+  set_instrument_and_final_stage_var(LIBXML2_DEFINITIONS "-DLIBXML_STATIC" STRING)
   set_instrument_and_final_stage_var(LLDB_ENABLE_LIBXML2 "OFF" BOOL)
   set_instrument_and_final_stage_var(CLANG_ENABLE_LIBXML2 "OFF" BOOL)
   set_instrument_and_final_stage_var(LLVM_ENABLE_RPMALLOC "ON" BOOL)