microsoft/vscode
microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2024-10-23 08:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: CLI is missing guard:cf flags" (#231874)

Browse Source 
Revert "fix: CLI is missing guard:cf flags (#231863)"

This reverts commit 1e580bc97d.
This commit is contained in:
Raymond Zhao 2024-10-21 12:48:49 -07:00 committed by GitHub
parent f5ac6168e0
commit d5baf34009
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/azure-pipelines/win32/cli-build-win32.yml
View File

@ -53,8 +53,7 @@ steps:
VSCODE_CLI_ENV:
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static/lib
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static/include
RUSTFLAGS: "-Ctarget-feature=+crt-static -Clink-args=/guard:cf -Clink-args=/CETCOMPAT"
CFLAGS: "/guard:cf /Qspectre"
RUSTFLAGS: "-C target-feature=+crt-static"
- ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}:
- template: ../cli/cli-compile.yml@self
@ -66,8 +65,7 @@ steps:
VSCODE_CLI_ENV:
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static/lib
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static/include
RUSTFLAGS: "-C target-feature=+crt-static -Clink-args=/guard:cf -Clink-args=/CETCOMPAT"
CFLAGS: "/guard:cf /Qspectre"
RUSTFLAGS: "-C target-feature=+crt-static"
- ${{ if not(parameters.VSCODE_CHECK_ONLY) }}:
- ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}:

2
cli/.cargo/config.toml
View File

@ -1,2 +0,0 @@
[target.'cfg(target_os = "windows")']
rustflags = ["-Ctarget-feature=+crt-static", "-Clink-args=/guard:cf", "-Clink-args=/CETCOMPAT"]

2
cli/CONTRIBUTING.md
View File

@ -8,7 +8,7 @@
For the moment, we require OpenSSL on Windows, where it is not usually installed by default. To install it:
1. Follow steps 1 and 2 of [Set up vcpkg](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started-msbuild?pivots=shell-powershell#1---set-up-vcpkg) to obtain the executable.
1. Install (clone) vcpkg [using their instructions](https://github.com/Microsoft/vcpkg#quick-start-windows)
1. Add the location of the `vcpkg` directory to your system or user PATH.
1. Run`vcpkg install openssl:x64-windows-static-md` (after restarting your terminal for PATH changes to apply)
1. You should be able to then `cargo build` successfully