Skip to content

Commit

Permalink
chore: fix development issues on Windows (denoland#14030)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsherret committed Mar 21, 2022
1 parent 45ef3c9 commit b410937
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
9 changes: 9 additions & 0 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]

[target.'cfg(all(windows, debug_assertions))']
rustflags = [
"-C",
"target-feature=+crt-static",
"-C",
# double the stack size to prevent swc overflowing the stack in debug
"link-arg=/STACK:2097152",
]

[target.aarch64-apple-darwin]
rustflags = ["-C", "link-arg=-fuse-ld=lld"]
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ jobs:
export_default_credentials: true

- name: Error on warning
# TODO(piscisaureus): enable this on Windows again.
if: "!startsWith(matrix.os, 'windows')"
run: echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV

- name: Configure canary build
Expand Down
2 changes: 1 addition & 1 deletion cli/tests/integration/run_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2334,7 +2334,7 @@ fn issue9750() {
Input("yy\n"),
Output("⚠️ ️Deno requests env access. Run again with --allow-env to bypass this prompt.\r\n Allow? [y/n (y = yes allow, n = no deny)]"),
Input("n\n"),
Output("⚠️ ️Deno requests env access to \"SECRET\". Run again with --allow-run to bypass this prompt.\r\n Allow? [y/n (y = yes allow, n = no deny)]"),
Output("⚠️ ️Deno requests env access to \"SECRET\". Run again with --allow-env to bypass this prompt.\r\n Allow? [y/n (y = yes allow, n = no deny)]"),
Input("n\n"),
Output("error: Uncaught (in promise) PermissionDenied: Requires env access to \"SECRET\", run again with the --allow-env flag\r\n"),
],
Expand Down
3 changes: 3 additions & 0 deletions runtime/ops/signal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ use deno_core::error::AnyError;
use deno_core::op;

use deno_core::Extension;
#[cfg(unix)]
use deno_core::OpState;
#[cfg(unix)]
use std::cell::RefCell;
#[cfg(unix)]
use std::rc::Rc;

#[cfg(unix)]
Expand Down

0 comments on commit b410937

Please sign in to comment.