Skip to content

(PA-7809) Update windows toolchain to use the updated GCC_ROOT for mingw 11.2.0 install #106

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

Merged
joshcooper merged 1 commit into from
Feb 2, 2026
Merged

(PA-7809) Update windows toolchain to use the updated GCC_ROOT for mingw 11.2.0 install #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion configs/platforms/windows-2012r2-x64.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# We don't want to install any packages from the chocolatey repo by accident
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe sources remove -name chocolatey"

plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw-w64 -version 5.2.0 -debug --no-progress"
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw -version 11.2.0 -debug --no-progress"
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress"

plat.install_build_dependencies_with "C:/ProgramData/chocolatey/bin/choco.exe install -y --no-progress"
Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/windows-2012r2-x86.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# We don't want to install any packages from the chocolatey repo by accident
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe sources remove -name chocolatey"

plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw-w32 -version 5.2.0 -debug -x86 --no-progress"
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw -version 11.2.0 -debug -x86 --no-progress"
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress"

plat.install_build_dependencies_with "C:/ProgramData/chocolatey/bin/choco.exe install -y --no-progress"
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/pl-toolchain.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
instance_eval File.read('configs/projects/pl-build-tools.rb')

proj.description "Puppet Labs cmake toolchain files"
proj.version "2015.12.01"
proj.version "2025.10.15"
proj.license "Puppet Labs"
proj.vendor "Puppet Labs <info@puppetlabs.com>"
proj.homepage "https://www.puppetlabs.com"
Expand Down
2 changes: 1 addition & 1 deletion files/cmake/windows-x64-toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SET(CMAKE_SYSTEM_VERSION 1)

# specify the cross compiler
SET(PL_TOOLS_ROOT C:/tools/pl-build-tools)
SET(GCC_ROOT C:/tools/mingw64)
SET(GCC_ROOT C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64)
SET(CMAKE_C_COMPILER ${GCC_ROOT}/bin/gcc.exe)
SET(CMAKE_CXX_COMPILER ${GCC_ROOT}/bin/g++.exe)

Expand Down
2 changes: 1 addition & 1 deletion files/cmake/windows-x86-toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SET(CMAKE_SYSTEM_VERSION 1)

# specify the cross compiler
SET(PL_TOOLS_ROOT C:/tools/pl-build-tools)
SET(GCC_ROOT C:/tools/mingw32)
SET(GCC_ROOT C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw32)
SET(CMAKE_C_COMPILER ${GCC_ROOT}/bin/gcc.exe)
SET(CMAKE_CXX_COMPILER ${GCC_ROOT}/bin/g++.exe)

Expand Down