From 40067bc7e6eba04ac05f19100b3ea0952bae5d0e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 29 Oct 2023 23:02:03 +0000 Subject: [PATCH] test cfg: compile + !link --- .github/workflows/build.yml | 2 +- _build.sh | 2 +- _versions.sh | 2 +- appveyor.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3390fe58..b81068c40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }}' diff --git a/_build.sh b/_build.sh index 4b50db444..18290ed0d 100755 --- a/_build.sh +++ b/_build.sh @@ -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 diff --git a/_versions.sh b/_versions.sh index 7c9f66fc9..e104e807b 100755 --- a/_versions.sh +++ b/_versions.sh @@ -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 diff --git a/appveyor.yml b/appveyor.yml index 787352db9..a5b533489 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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: