Skip to content

Commit 41b6d39

Browse files
authored
Remove AVX2-related options from vcpkg (#754)
* Update release flags and strip settings in OBS triplets Added -DCMAKE_INSTALL_DO_STRIP=OFF to all OBS vcpkg triplets to prevent stripping during install. Updated release build flags for improved debugging and security: added debug info and stack protection for Linux/macOS, and enabled /Z7 and linker optimizations for Windows. Removed AVX2 and visibility flags from release builds. * Update vcpkg-configuration.json
1 parent fbe6ced commit 41b6d39

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

vcpkg-configuration.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
33
"default-registry": {
44
"kind": "git",
5-
"baseline": "cfcbdb245f1179a5a493890a0b69531d66969e62",
5+
"baseline": "e3db8f65d2414c301c29a8467c6aee94e3ba09fc",
66
"repository": "https://github.com/microsoft/vcpkg"
77
},
88
"registries": [
99
{
1010
"kind": "git",
11-
"baseline": "901fdb51caca7b97a3fb37810642dc28631ece49",
11+
"baseline": "5de6c8232743afe35a9603d508dd8b4d40fb095e",
1212
"repository": "https://github.com/kaito-tokyo/vcpkg-obs-kaito-tokyo",
1313
"packages": [
1414
"libpng",

vcpkg-triplets/arm64-osx-obs.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
55
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
66
set(VCPKG_OSX_ARCHITECTURES arm64)
77

8+
set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_INSTALL_DO_STRIP=OFF)
89
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")
9-
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fvisibility=hidden")
10-
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
10+
set(VCPKG_C_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE} -g -fno-omit-frame-pointer -fstack-protector-strong")
11+
set(VCPKG_CXX_FLAGS_RELEASE "${VCPKG_CXX_FLAGS_RELEASE} -g -fno-omit-frame-pointer -fstack-protector-strong")

vcpkg-triplets/x64-linux-obs.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ set(VCPKG_LIBRARY_LINKAGE static)
44

55
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
66

7-
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx2 -fvisibility=hidden")
8-
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx2 -fvisibility=hidden -fvisibility-inlines-hidden")
7+
set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_INSTALL_DO_STRIP=OFF)
8+
set(VCPKG_C_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE} -g -fno-omit-frame-pointer -fstack-protector-strong")
9+
set(VCPKG_CXX_FLAGS_RELEASE "${VCPKG_CXX_FLAGS_RELEASE} -g -fno-omit-frame-pointer -fstack-protector-strong")

vcpkg-triplets/x64-osx-obs.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
55
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
66
set(VCPKG_OSX_ARCHITECTURES x86_64)
77

8+
set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_INSTALL_DO_STRIP=OFF)
89
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")
9-
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx2 -fvisibility=hidden")
10-
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx2 -fvisibility=hidden -fvisibility-inlines-hidden")
10+
set(VCPKG_C_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE} -g -fno-omit-frame-pointer -fstack-protector-strong")
11+
set(VCPKG_CXX_FLAGS_RELEASE "${VCPKG_CXX_FLAGS_RELEASE} -g -fno-omit-frame-pointer -fstack-protector-strong")
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
set(VCPKG_TARGET_ARCHITECTURE x64)
2-
set(VCPKG_CRT_LINKAGE dynamic)
3-
set(VCPKG_LIBRARY_LINKAGE static)
4-
5-
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /arch:AVX2")
6-
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /arch:AVX2")
1+
set(VCPKG_TARGET_ARCHITECTURE x64)
2+
set(VCPKG_CRT_LINKAGE dynamic)
3+
set(VCPKG_LIBRARY_LINKAGE static)
4+
5+
set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_INSTALL_DO_STRIP=OFF)
6+
set(VCPKG_C_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE} /Z7")
7+
set(VCPKG_CXX_FLAGS_RELEASE "${VCPKG_CXX_FLAGS_RELEASE} /Z7")
8+
set(VCPKG_LINKER_FLAGS_RELEASE "${VCPKG_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")

0 commit comments

Comments
 (0)