Skip to content

Commit c1e36ad

Browse files
committed
Fix asan dual-linkage: remove static lib preference from san preset
The san preset had CMAKE_FIND_LIBRARY_SUFFIXES=".a" which caused find_dependency(Glog) to find libglog.a, while the tarball's folly-targets.cmake hardcodes libglog.so. Both copies loaded under ASAN, crashing on glog's logtostderr flag double-registration. Removing the static preference lets the san build link consistently against .so files for system deps. Also reverts the temporary continue-on-error for asan.
1 parent 62fbde1 commit c1e36ad

2 files changed

Lines changed: 0 additions & 3 deletions

File tree

.github/workflows/ci-pr.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,8 @@ jobs:
9595
preset: san
9696
build_dir: build-san
9797
runner: ubuntu-22.04
98-
allow_failure: true
9998
name: ${{ matrix.name }}
10099
runs-on: ${{ matrix.runner }}
101-
continue-on-error: ${{ matrix.allow_failure || false }}
102100
steps:
103101
- name: Generate app token
104102
id: app-token

CMakePresets.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"cacheVariables": {
2727
"CMAKE_BUILD_TYPE": "Debug",
2828
"ORLY_ENABLE_SANITIZERS": "ON",
29-
"CMAKE_FIND_LIBRARY_SUFFIXES": ".a",
3029
"CMAKE_MODULE_PATH": "${sourceDir}/cmake",
3130
"CMAKE_POLICY_VERSION_MINIMUM": "3.5"
3231
}

0 commit comments

Comments
 (0)