From 234efb959c3f8aec841f7950a1b0da623b74ac53 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 9 Nov 2023 23:27:18 -0800 Subject: [PATCH 1/2] Static linking the MSVC runtime --- dsc/.cargo/config.toml | 2 ++ dsc_lib/.cargo/config.toml | 2 ++ osinfo/.cargo/config.toml | 2 ++ process/.cargo/config.toml | 2 ++ registry/.cargo/config.toml | 2 ++ tools/dsctest/.cargo/config.toml | 2 ++ tools/test_group_resource/.cargo/config.toml | 2 ++ y2j/.cargo/config.toml | 2 ++ 8 files changed, 16 insertions(+) create mode 100644 dsc/.cargo/config.toml create mode 100644 dsc_lib/.cargo/config.toml create mode 100644 osinfo/.cargo/config.toml create mode 100644 process/.cargo/config.toml create mode 100644 registry/.cargo/config.toml create mode 100644 tools/dsctest/.cargo/config.toml create mode 100644 tools/test_group_resource/.cargo/config.toml create mode 100644 y2j/.cargo/config.toml diff --git a/dsc/.cargo/config.toml b/dsc/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/dsc/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/dsc_lib/.cargo/config.toml b/dsc_lib/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/dsc_lib/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/osinfo/.cargo/config.toml b/osinfo/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/osinfo/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/process/.cargo/config.toml b/process/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/process/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/registry/.cargo/config.toml b/registry/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/registry/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/tools/dsctest/.cargo/config.toml b/tools/dsctest/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/tools/dsctest/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/tools/test_group_resource/.cargo/config.toml b/tools/test_group_resource/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/tools/test_group_resource/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/y2j/.cargo/config.toml b/y2j/.cargo/config.toml new file mode 100644 index 00000000..0c17df09 --- /dev/null +++ b/y2j/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file From 1ed8063695a75e01596215d564b7fbaccaaa4571 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 14 Nov 2023 12:32:43 -0800 Subject: [PATCH 2/2] Added fix for aarch64-pc-windows-msvc --- dsc/.cargo/config.toml | 2 ++ dsc_lib/.cargo/config.toml | 2 ++ osinfo/.cargo/config.toml | 2 ++ process/.cargo/config.toml | 2 ++ registry/.cargo/config.toml | 2 ++ tools/dsctest/.cargo/config.toml | 2 ++ tools/test_group_resource/.cargo/config.toml | 2 ++ y2j/.cargo/config.toml | 2 ++ 8 files changed, 16 insertions(+) diff --git a/dsc/.cargo/config.toml b/dsc/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/dsc/.cargo/config.toml +++ b/dsc/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/dsc_lib/.cargo/config.toml b/dsc_lib/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/dsc_lib/.cargo/config.toml +++ b/dsc_lib/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/osinfo/.cargo/config.toml b/osinfo/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/osinfo/.cargo/config.toml +++ b/osinfo/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/process/.cargo/config.toml b/process/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/process/.cargo/config.toml +++ b/process/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/registry/.cargo/config.toml b/registry/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/registry/.cargo/config.toml +++ b/registry/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/tools/dsctest/.cargo/config.toml b/tools/dsctest/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/tools/dsctest/.cargo/config.toml +++ b/tools/dsctest/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/tools/test_group_resource/.cargo/config.toml b/tools/test_group_resource/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/tools/test_group_resource/.cargo/config.toml +++ b/tools/test_group_resource/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file diff --git a/y2j/.cargo/config.toml b/y2j/.cargo/config.toml index 0c17df09..af6c0731 100644 --- a/y2j/.cargo/config.toml +++ b/y2j/.cargo/config.toml @@ -1,2 +1,4 @@ [target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] +[target.aarch64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] \ No newline at end of file