Skip to content

Commit 2258e0c

Browse files
committed
before-all cibw reinstall gcc
Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>
1 parent 46f8519 commit 2258e0c

4 files changed

Lines changed: 5 additions & 14 deletions

File tree

.github/workflows/build-test-release.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,16 +199,6 @@ jobs:
199199
name: version
200200
path: .
201201

202-
- name: Set up gcc
203-
if: runner.os == 'Linux'
204-
run: |
205-
sudo apt-get update
206-
sudo apt-get install -y ninja-build gcc-14 g++-14 clang-18
207-
sudo ln -s /usr/bin/clang-18 /usr/local/bin/clang
208-
sudo ln -s /usr/bin/clang++-18 /usr/local/bin/clang++
209-
sudo ln -s /usr/bin/gcc-14 /usr/local/bin/gcc
210-
sudo ln -s /usr/bin/g++-14 /usr/local/bin/g++
211-
212202
- uses: ./.github/actions/enable-msvc
213203
if: runner.os == 'Windows'
214204

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
{
110110
"name": "unix-sanitizer",
111111
"environment": {
112-
"SANITIZER_FLAGS": "-fstack-protector -fsanitize=address,pointer-compare,undefined"
112+
"SANITIZER_FLAGS": "-fstack-protector -fsanitize=address,pointer-compare,undefined -fno-sanitize-recover"
113113
},
114114
"inherits": "unix-base",
115115
"hidden": true

power_grid_model_c/power_grid_model_c/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ if(PGM_ENABLE_HARDENING)
6363
target_compile_options(
6464
power_grid_model_c
6565
BEFORE
66-
PRIVATE "-fstack-protector" "-fsanitize=undefined"
66+
PRIVATE "-fstack-protector" "-fsanitize=undefined" "-fno-sanitize-recover=undefined"
6767
)
6868
endif()
6969
target_link_options(
7070
power_grid_model_c
7171
BEFORE
7272
PRIVATE
73-
"$<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:-fstack-protector;-fsanitize=undefined>"
73+
"$<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:-fstack-protector;-fsanitize=undefined;-fno-sanitize-recover=undefined>"
7474
"$<$<CXX_COMPILER_ID:GNU>:-static-libubsan>"
7575
"$<$<CXX_COMPILER_ID:Clang>:-lubsan>"
7676
)

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ skip = ["pp*", "*-musllinux_aarch64"]
211211

212212
[tool.cibuildwheel.linux]
213213
archs = ["x86_64", "aarch64"]
214-
environment = { CC = "gcc", CXX = "g++" }
214+
before-all = """yum install -y gcc-14 g++-14"""
215+
environment = { CC = "gcc-14", CXX = "g++-14" }
215216
manylinux-x86_64-image = "manylinux_2_28"
216217
manylinux-aarch64-image = "manylinux_2_28"
217218
musllinux-x86_64-image = "musllinux_1_2"

0 commit comments

Comments
 (0)