Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(fleets): normalize Windows native linker flags (#6732)

r33drichards8e67701d2b39
diff --git a/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh b/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
index 632ae5165e..1d05bf6c2f 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
@@ -74,6 +74,39 @@ native_static_libs="$(sed -n 's/.*native-static-libs: //p' "$build_log" | tail -
exit 1
}
+if [ "$goos" = windows ]; then
+ windows_linker_flags=()
+ for library in $native_static_libs; do
+ case "$library" in
+ /defaultlib:*.lib)
+ windows_linker_flags+=("-l${library#/defaultlib:}")
+ ;;
+ /defaultlib:*)
+ windows_linker_flags+=("-l${library#/defaultlib:}")
+ ;;
+ *.lib)
+ packaged_library=
+ cargo_registry_src="${CARGO_HOME:-$HOME/.cargo}/registry/src"
+ if [ -d "$cargo_registry_src" ]; then
+ while IFS= read -r candidate; do
+ packaged_library="$candidate"
+ break
+ done < <(find "$cargo_registry_src" -type f -name "$library" -print)
+ fi
+ if [ -n "$packaged_library" ]; then
+ windows_linker_flags+=("$(cygpath -m "$packaged_library")")
+ else
+ windows_linker_flags+=("-l${library%.lib}")
+ fi
+ ;;
+ *)
+ windows_linker_flags+=("$library")
+ ;;
+ esac
+ done
+ native_static_libs="${windows_linker_flags[*]}"
+fi
+
build_dir="$(mktemp -d)"
trap 'rm -f "$build_log"; rm -rf "$build_dir"' EXIT
diff --git a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
index c71f299cfd..20a0393c8e 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
@@ -36,5 +36,7 @@ require 'CARGO_TERM_COLOR=never' "$builder"
require 'cargo rustc' "$builder"
require '--crate-type staticlib' "$builder"
require '--print native-static-libs' "$builder"
+require 'windows_linker_flags' "$builder"
+require "cygpath -m \"\$packaged_library\"" "$builder"
require 'CGO_ENABLED=1' "$builder"
require "terraform-provider-fleets_\${version}_\${goos}_\${goarch}.zip" "$builder"