Skip to content

Commit

Permalink
test cfg: compile + !link
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Oct 29, 2023
1 parent 2f223e6 commit 40067bc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:
- name: 'build'
env:
CW_LLVM_MINGW_DL: '1'
CW_LLVM_MINGW_ONLY: '0'
CW_LLVM_MINGW_ONLY: '1'
run: |
export CW_CONFIG='${{ github.ref_name }}-win-gcc'
export CW_REVISION='${{ github.sha }}'
Expand Down
2 changes: 1 addition & 1 deletion _build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ build_single_target() {
# llvm-mingw with all objects compiled with cfguard, and cfguard enabled
# at link time to end up with a runnable exe.
_CFLAGS_GLOBAL="${_CFLAGS_GLOBAL} -mguard=cf"
_LDFLAGS_GLOBAL="${_LDFLAGS_GLOBAL} -mguard=cf"
# _LDFLAGS_GLOBAL="${_LDFLAGS_GLOBAL} -mguard=cf"
fi

if [ -n "${_SYSROOT}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion _versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export CURL_HASH=16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82
# Create revision string
# NOTE: Set _REV to 1 after bumping CURL_VER_, then increment for each
# CI rebuild via `main` branch push (e.g. after bumping a dependency).
export _REV="${CW_REVISION:-6}"
export _REV="${CW_REVISION:-6t1-cfg-cflags-only}"

export CACERT_VER_='2023-08-22'
export CACERT_HASH=23c2469e2a568362a62eecf1b49ed90a15621e6fa30e29947ded3436422de9b9
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ build:
verbosity: 'detailed'
environment:
CW_LLVM_MINGW_DL: '1'
CW_LLVM_MINGW_ONLY: '0'
CW_LLVM_MINGW_ONLY: '1'
CW_MAP: '0'
CW_JOBS: '2'
SIGN_CODE_GPG_PASS:
Expand Down

0 comments on commit 40067bc

Please sign in to comment.