Skip to content

Commit 6d4c187

Browse files
committed
Remove mingw toolset, use gcc/clang instead.
1 parent 8cd7ef9 commit 6d4c187

File tree

6 files changed

+13
-17
lines changed

6 files changed

+13
-17
lines changed

.github/workflows/ci-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
config: [debug, release]
9595
msystem: [mingw32, mingw64]
9696
depsrc: [none, contrib, system]
97-
cc: [mingw]
97+
cc: [gcc]
9898
include:
9999
- platform: x86
100100
msystem: mingw32
@@ -132,7 +132,7 @@ jobs:
132132
- name: Docs check
133133
run: bin/${{ matrix.config }}/premake5.exe docs-check
134134
- name: Upload Artifacts
135-
if: matrix.config == 'release' && matrix.depsrc == 'contrib' && matrix.cc == 'mingw'
135+
if: matrix.config == 'release' && matrix.depsrc == 'contrib' && matrix.cc == 'gcc'
136136
uses: actions/upload-artifact@v4
137137
with:
138138
name: premake-${{ matrix.msystem }}-${{ matrix.platform }}

Bootstrap.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ mingw: mingw-clean
8989
mkdir -p build/bootstrap
9090
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_STATICLIB -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lole32 -lversion
9191
./build/bootstrap/premake_bootstrap embed
92-
./build/bootstrap/premake_bootstrap --arch=$(PLATFORM) --os=windows --to=build/bootstrap --cc=mingw $(PREMAKE_OPTS) gmake
92+
./build/bootstrap/premake_bootstrap --arch=$(PLATFORM) --os=windows --to=build/bootstrap --cc=gcc $(PREMAKE_OPTS) gmake
9393
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)_$(PLATFORM:x86=win32)
9494

9595
macosx: osx

premake5.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
flags { "NoIncrementalLink" }
254254

255255
-- MinGW AR does not handle LTO out of the box and need a plugin to be setup
256-
filter { "system:windows", "configurations:Release", "toolset:not mingw" }
257-
flags { "LinkTimeOptimization" }
256+
filter { "system:windows", "configurations:Release", "toolset:msc" }
257+
flags { "LinkTimeOptimization" }
258258

259259
filter { "system:uwp" }
260260
systemversion "latest:latest"
@@ -312,8 +312,8 @@
312312
links { "ole32", "ws2_32", "advapi32", "version" }
313313
files { "src/**.rc" }
314314

315-
filter "toolset:mingw"
316-
links { "crypt32", "bcrypt" }
315+
filter { "system:windows", "toolset:not msc" }
316+
links { "crypt32", "bcrypt" }
317317

318318
filter "system:linux or bsd or hurd"
319319
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }

src/_manifest.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
"tools/msc.lua",
6565
"tools/snc.lua",
6666
"tools/clang.lua",
67-
"tools/mingw.lua",
6867
"tools/cosmocc.lua",
6968
"tools/emcc.lua",
7069

src/_premake_init.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@
12181218
allowed = {
12191219
{ "clang", "Clang (clang)" },
12201220
{ "gcc", "GNU GCC (gcc/g++)" },
1221-
{ "mingw", "MinGW GCC (gcc/g++)" },
1221+
{ "mingw", "MinGW GCC (gcc/g++)" }, -- deprecated
12221222
{ "msc-v80", "Microsoft compiler (Visual Studio 2005)" },
12231223
{ "msc-v90", "Microsoft compiler (Visual Studio 2008)" },
12241224
{ "msc-v100", "Microsoft compiler (Visual Studio 2010)" },
@@ -1235,6 +1235,11 @@
12351235
}
12361236
}
12371237

1238+
if _OPTIONS[cc] == "mingw" then
1239+
p.warn("--cc=mingw is deprecated, use --cc=gcc instead")
1240+
_OPTIONS[cc] = "gcc"
1241+
end
1242+
12381243
newoption
12391244
{
12401245
category = "compilers",

src/tools/mingw.lua

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)