Skip to content

Booststrap vs clang #2576

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
nickclark2016 merged 2 commits into from
Dec 22, 2025
+14 −9
Merged

Booststrap vs clang #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0dead
Allow to pass `PREMAKE_OPTS` to Bootstrap.bat
Jarod42 Dec 27, 2024
9314adc
Fix compilation with visual studio using clang
Jarod42 Oct 11, 2025
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
5 changes: 3 additions & 2 deletions .github/workflows/ci-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ jobs:
config: [debug, release]
platform: [Win32, x64]
msdev: [vs2022]
cc: [msc, clang]
timeout-minutes: 15
steps:
- name: Checkout
Expand All @@ -74,15 +75,15 @@ jobs:
env:
PLATFORM: ${{ matrix.platform }}
CONFIG: ${{ matrix.config }}
run: ./Bootstrap.bat ${{ matrix.msdev }}
run: ./Bootstrap.bat ${{ matrix.msdev }} "PREMAKE_OPTS=--cc=${{ matrix.cc }}"
- name: Test
run: bin\${{ matrix.config }}\premake5 test --test-all
shell: cmd
- name: Docs check
run: bin\${{ matrix.config }}\premake5 docs-check
shell: cmd
- name: Upload Artifacts
if: matrix.config == 'release'
if: matrix.config == 'release' && matrix.cc == 'msc'
uses: actions/upload-artifact@v6
with:
name: premake-windows-${{ matrix.platform }}
Expand Down
14 changes: 8 additions & 6 deletions Bootstrap.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ IF "%vsversion%" == "" (
EXIT /B %ERRORLEVEL%
)

SET PREMAKE_OPTS=%2

IF "%vsversion%" == "vs2010" (
CALL :LegacyVisualBootstrap "%vsversion%" "100"

Expand All @@ -39,13 +41,13 @@ IF "%vsversion%" == "vs2010" (
CALL :LegacyVisualBootstrap "%vsversion%" "140"

) ELSE IF "%vsversion%" == "vs2017" (
CALL :VsWhereVisualBootstrap "%vsversion%" "15.0" "16.0"
CALL :VsWhereVisualBootstrap "%vsversion%" "15.0" "16.0" %PREMAKE_OPTS%

) ELSE IF "%vsversion%" == "vs2019" (
CALL :VsWhereVisualBootstrap "%vsversion%" "16.0" "17.0"
CALL :VsWhereVisualBootstrap "%vsversion%" "16.0" "17.0" %PREMAKE_OPTS%

) ELSE IF "%vsversion%" == "vs2022" (
CALL :VsWhereVisualBootstrap "%vsversion%" "17.0" "18.0"
CALL :VsWhereVisualBootstrap "%vsversion%" "17.0" "18.0" %PREMAKE_OPTS%

) ELSE IF "%vsversion%" == "vs18" (
CALL :VsWhereVisualBootstrap "vs2026" "18.0" "19.0"
Expand Down Expand Up @@ -96,6 +98,7 @@ REM %3: VisualStudio-style VSversionMax -> ex: 16.0
SET "PremakeVsVersion=%~1"
SET "VsVersionMin=%~2"
SET "VsVersionMax=%~3"
SET PREMAKE_OPTS=%4

REM ref: https://github.com/Microsoft/vswhere/wiki/Start-Developer-Command-Prompt

Expand All @@ -107,13 +110,12 @@ IF NOT EXIST %VsWherePath% (
SET VsWhereCmdLine="!VsWherePath! -nologo -latest -version [%VsVersionMin%,%VsVersionMax%) -property installationPath"

FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (

IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% %PREMAKE_OPTS% -f Bootstrap.mak windows
EXIT /B %ERRORLEVEL%
) ELSE (
IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% %PREMAKE_OPTS% -f Bootstrap.mak windows
EXIT /B %ERRORLEVEL%
)
)
Expand Down
4 changes: 3 additions & 1 deletion premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@

filter "system:windows"
links { "ole32", "ws2_32", "advapi32", "version" }
files { "src/**.rc" }

filter { "system:windows", "toolset:msc*" }
files { "src/**.rc" }

filter "toolset:mingw"
links { "crypt32", "bcrypt" }
Expand Down
Loading