Update windows_repro_build_compare.sh to allow for windows Redist dev…

…kit (#4022) * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> * Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard <[email protected]> --------- Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Nov 5, 2024 · cb952f4 · cb952f4
1 parent a9554dd
commit cb952f4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -79,12 +79,18 @@ configureDevKitConfigureParameter() {
     if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
       # Windows DevKit, currently only Redist DLLs
 
+      # Default to build architecture unless target ARCHITECTURE variable is set
+      local target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}"
+      if [ ${ARCHITECTURE+x} ] && [ -n "${ARCHITECTURE}" ]; then
+        target_arch="${ARCHITECTURE}"
+      fi
+      echo "Target architecture for Windows devkit: ${target_arch}"
+
       # This is TARGET Architecture for the Redist DLLs to use
-      # ARCHITECTURE is set to the "target" architecture by caller, or defaults to build architecture if not set
       local dll_arch
-      if [[ "${ARCHITECTURE}" == "x86-32" ]]; then
+      if [[ "${target_arch}" == "x86-32" ]]; then
         dll_arch="x86"
-      elif [[ "${ARCHITECTURE}" == "aarch64" ]]; then
+      elif [[ "${target_arch}" == "aarch64" ]]; then
         dll_arch="arm64"
       else
         dll_arch="x64"

diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh
@@ -684,10 +684,12 @@ Check_Architecture
 echo "---------------------------------------------"
 Check_VS_Versions
 echo "---------------------------------------------"
-Get_SRC_UCRT_Version
-echo "---------------------------------------------"
-Check_UCRT_Location
-echo "---------------------------------------------"
+if [[ "${buildArgs}" != *"--use-adoptium-devkit"* ]]; then
+  Get_SRC_UCRT_Version
+  echo "---------------------------------------------"
+  Check_UCRT_Location
+  echo "---------------------------------------------"
+fi
 echo "All Validation Checks Passed - Proceeding To Build"
 echo "---------------------------------------------"
 Check_And_Install_Ant