Skip to content

[windows|toolchain] Try using /Zi #25692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Alexander Neumann (Neumann-A) wants to merge 37 commits into from
Closed

[windows|toolchain] Try using /Zi #25692

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
21d9c65
reduce pipeline load
Neumann-A Jul 11, 2022
2211d43
post/pre portfile includes
Neumann-A Jul 11, 2022
d09d5c7
trying to add Zi
Neumann-A Jul 11, 2022
de92c9e
cmake_language magic to inject install rules
Neumann-A Jul 11, 2022
c90ddc0
Zi magic.
Neumann-A Jul 11, 2022
7f95bec
don't use bin dir in static builds
Neumann-A Jul 11, 2022
5409c28
make sure pdbs exist before installing them
Neumann-A Jul 11, 2022
77f562c
Fix parallel link jobs with meson ports. (cannot run parallel link jo…
Neumann-A Jul 11, 2022
664e2fe
only one link job at a time for cmake
Neumann-A Jul 11, 2022
b27e945
use job pools correctly
Neumann-A Jul 12, 2022
8bc387a
try fixing boost-build
Neumann-A Jul 12, 2022
5a5b2cc
not possible to trick b2 with invalid values
Neumann-A Jul 12, 2022
468ed0a
actually use regex replace ;) [skip actions]
Neumann-A Jul 12, 2022
8b0f4f0
fix openssl (already uses pdbs)
Neumann-A Jul 13, 2022
2f4001b
disable pch in boost since it seems to be broken in most cases.
Neumann-A Jul 13, 2022
2300d5b
use console instead of a new job pool (some ports seem to choke on that)
Neumann-A Jul 13, 2022
3f916c8
WIP commit
Neumann-A Jul 14, 2022
557db4d
pdb stuff
Neumann-A Jul 15, 2022
87dd582
WIP [skip actions]
Neumann-A Jul 15, 2022
d6bdf1d
WIP cleanup [skip actions]
Neumann-A Jul 15, 2022
271ef80
more WIP [skip actions]
Neumann-A Jul 16, 2022
2408612
pdb testrun
Neumann-A Jul 17, 2022
c558376
make sure /Z7 is only added for targets without assembly
Neumann-A Jul 17, 2022
d868304
bit of refactor and fixing boost-build
Neumann-A Jul 18, 2022
9470123
fix additional regex characters
Neumann-A Jul 18, 2022
6423c89
fix protobuf
Neumann-A Jul 18, 2022
7b1f89e
filter files
Neumann-A Jul 18, 2022
06762ab
crashpad don't include toolchain
Neumann-A Jul 18, 2022
8494ba4
build nmkae don't include toolchain
Neumann-A Jul 18, 2022
aa85d23
fix already installed search
Neumann-A Jul 18, 2022
1ff1a87
fix typo
Neumann-A Jul 18, 2022
c688169
minor fixes to the boost build helper
Neumann-A Jul 19, 2022
9f5d571
v db
Neumann-A Jul 19, 2022
262385c
Merge remote-tracking branch 'upstream/master' into fix_zi_in_boost_b…
Neumann-A Jul 20, 2022
93ce164
Merge remote-tracking branch 'upstream/master' into try_to_use_Zi
Neumann-A Jul 26, 2022
557298e
Merge remote-tracking branch 'origin/fix_zi_in_boost_build' into try_…
Neumann-A Jul 26, 2022
fdbf37f
fix copying of pdbs in boost-* ports
Neumann-A Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ __pycache__/
!/triplets/x64-uwp.cmake
!/triplets/x64-windows-static.cmake
!/triplets/x64-windows.cmake
!/triplets/move_pdb_files.cmake
!/triplets/x86-windows.cmake

!/triplets/community
Expand Down
52 changes: 0 additions & 52 deletions scripts/azure-pipelines/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,61 +13,9 @@ parameters:
default: 'use default'

jobs:
- template: windows/azure-pipelines.yml
parameters:
triplet: x86-windows
jobName: x86_windows
poolName: $(windows-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: windows/azure-pipelines.yml
parameters:
triplet: x64-windows
jobName: x64_windows
poolName: $(windows-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: windows/azure-pipelines.yml
parameters:
triplet: x64-windows-static
jobName: x64_windows_static
poolName: $(windows-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: windows/azure-pipelines.yml
parameters:
triplet: x64-windows-static-md
jobName: x64_windows_static_md
poolName: $(windows-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: windows/azure-pipelines.yml
parameters:
triplet: x64-uwp
jobName: x64_uwp
poolName: $(windows-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: windows/azure-pipelines.yml
parameters:
triplet: arm64-windows
jobName: arm64_windows
poolName: $(windows-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: windows/azure-pipelines.yml
parameters:
triplet: arm-uwp
jobName: arm_uwp
poolName: $(windows-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: osx/azure-pipelines.yml
parameters:
poolName: $(osx-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}

- template: linux/azure-pipelines.yml
parameters:
poolName: $(linux-pool)
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
11 changes: 11 additions & 0 deletions scripts/ports.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,18 @@ if(CMD STREQUAL "BUILD")
set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt")
file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}")

foreach(z_pre_portfile_include IN LISTS VCPKG_PRE_PORTFILE_INCLUDES)
include("${z_pre_portfile_include}")
endforeach()
unset(z_pre_portfile_include)

include("${CURRENT_PORT_DIR}/portfile.cmake")

foreach(z_post_portfile_include IN LISTS VCPKG_POST_PORTFILE_INCLUDES)
include("${z_post_portfile_include}")
endforeach()
unset(z_post_portfile_include)

if(DEFINED PORT)
include("${SCRIPTS}/build_info.cmake")
endif()
Expand Down
18 changes: 13 additions & 5 deletions scripts/toolchains/windows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,24 @@ if(NOT _CMAKE_IN_TRY_COMPILE)

unset(CHARSET_FLAG)

set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "")
set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "")
set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "")
set(CMAKE_C_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "")
set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Zi /FS /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "")
set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Zi /FS /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "")
set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Zi /FS ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "")
set(CMAKE_C_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Zi /FS ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "")
Comment thread
Neumann-A marked this conversation as resolved.
Outdated

get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
if(NOT _CMAKE_IN_TRY_COMPILE)
string(APPEND CMAKE_SHARED_LINKER_FLAGS " /PDB:${CMAKE_BINARY_DIR}/${VCPKG_PORT}.pdb /PDBALTPATH:%_PDB% /PDBSTRIPPED:${CMAKE_BINARY_DIR}/${VCPKG_PORT}_strip.pdb")
string(APPEND CMAKE_STATIC_LINKER_FLAGS " /PDB:${CMAKE_BINARY_DIR}/${VCPKG_PORT}.pdb /PDBALTPATH:%_PDB% /PDBSTRIPPED:${CMAKE_BINARY_DIR}/${VCPKG_PORT}_strip.pdb")
string(APPEND CMAKE_EXE_LINKER_FLAGS " /PDB:${CMAKE_BINARY_DIR}/${VCPKG_PORT}.pdb /PDBALTPATH:%_PDB% /PDBSTRIPPED:${CMAKE_BINARY_DIR}/${VCPKG_PORT}_strip.pdb")
cmake_language(DEFER DIRECTORY "${CMAKE_SOURCE_DIR}" CALL install "FILES" "${CMAKE_BINARY_DIR}/${VCPKG_PORT}.pdb" "TYPE" "BIN")
cmake_language(DEFER DIRECTORY "${CMAKE_SOURCE_DIR}" CALL install "FILES" "${CMAKE_BINARY_DIR}/${VCPKG_PORT}_strip.pdb" "TYPE" "BIN")
endif()
string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")

string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ")
string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo")
string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ")
string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ")
endif()
Expand Down
25 changes: 25 additions & 0 deletions triplets/move_pdb_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

# For ports which are not CMake
if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${PORT}.pdb" AND
EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${PORT}.pdb")
file(INSTALL
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${PORT}.pdb"
DESTINATION
"${CURRENT_PACKAGES_DIR}/bin")
file(INSTALL
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${PORT}_strip.pdb"
DESTINATION
"${CURRENT_PACKAGES_DIR}/bin")
endif()

if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${PORT}.pdb" AND
EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${PORT}.pdb")
file(INSTALL
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${PORT}.pdb"
DESTINATION
"${CURRENT_PACKAGES_DIR}/debug/bin")
file(INSTALL
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${PORT}_strip.pdb"
DESTINATION
"${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
3 changes: 2 additions & 1 deletion triplets/x64-windows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_PORT=${PORT}")
set(VCPKG_POST_PORTFILE_INCLUDES "${CMAKE_CURRENT_LIST_DIR}/move_pdb_files.cmake")