Skip to content

Commit 449dbe5

Browse files
committed
Statically link the C runtime library on Windows (denoland#4469)
1 parent d143fe6 commit 449dbe5

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.cargo/config

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[target.x86_64-pc-windows-msvc]
2+
rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
if: startsWith(matrix.config.os, 'ubuntu') && matrix.config.kind == 'test_release' && startsWith(github.ref, 'refs/tags/') && github.repository == 'denoland/deno'
5555
run: |
5656
mkdir -p target/release
57-
tar --exclude=.cargo --exclude=".git*" --exclude=target --exclude=deno_typescript/typescript/tests --exclude=third_party/cpplint --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
57+
tar --exclude=.cargo_home --exclude=".git*" --exclude=target --exclude=deno_typescript/typescript/tests --exclude=third_party/cpplint --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
5858
5959
- name: Install rust
6060
uses: hecrj/setup-rust-action@v1
@@ -90,11 +90,11 @@ jobs:
9090
9191
- name: Configure cargo data directory
9292
# After this point, all cargo registry and crate data is stored in
93-
# $GITHUB_WORKSPACE/.cargo. This allows us to cache only the files that
94-
# are needed during the build process. Additionally, this works around
95-
# a bug in the 'cache' action that causes directories outside of the
96-
# workspace dir to be saved/restored incorrectly.
97-
run: echo "::set-env name=CARGO_HOME::$(pwd)/.cargo"
93+
# $GITHUB_WORKSPACE/.cargo_home. This allows us to cache only the files
94+
# that are needed during the build process. Additionally, this works
95+
# around a bug in the 'cache' action that causes directories outside of
96+
# the workspace dir to be saved/restored incorrectly.
97+
run: echo "::set-env name=CARGO_HOME::$(pwd)/.cargo_home"
9898

9999
- name: Cache
100100
uses: actions/cache@master
@@ -104,7 +104,7 @@ jobs:
104104
# so we cache only those subdirectories of target/{debug|release} that
105105
# contain the build output for crates that come from the registry.
106106
path: |-
107-
.cargo
107+
.cargo_home
108108
target/*/.*
109109
target/*/build
110110
target/*/deps

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*.pyc
33
*.swp
44

5-
/.cargo/
5+
/.cargo_home/
66
/.idea/
77
/.vscode/
88
gclient_config.py_entries

0 commit comments

Comments
 (0)