mirror of
https://github.com/Print3M/epic
synced 2026-06-06 16:34:33 +00:00
Windows build (MSYS2) fixed
This commit is contained in:
@@ -47,7 +47,7 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
gh release delete 1.0.1 --cleanup-tag --yes || echo "No release or tag found for 1.0.1"
|
||||
gh release delete 1.0.2 --cleanup-tag --yes || echo "No release or tag found for 1.0.2"
|
||||
|
||||
- name: Create Release
|
||||
id: create_release
|
||||
@@ -55,10 +55,11 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: 1.0.1
|
||||
release_name: EPIC 1.0.1
|
||||
tag_name: 1.0.2
|
||||
release_name: EPIC 1.0.2
|
||||
body: |
|
||||
- Wrong `pic-link` CLI output information fixed.
|
||||
- Windows build (MSYS2) support fixed.
|
||||
- Better error message when required command is not found.
|
||||
draft: false
|
||||
prerelease: false
|
||||
|
||||
|
||||
+8
-5
@@ -55,12 +55,13 @@ func MingwLd(params ...string) string {
|
||||
ld = "x86_64-w64-mingw32-ld"
|
||||
|
||||
if IsWindows() {
|
||||
ld += ".exe"
|
||||
ld = "ld.exe"
|
||||
}
|
||||
}
|
||||
|
||||
if !IsProgramAvailable(ld) {
|
||||
cli.LogErrf("Mingw-w64 ld linker not found: %s\n", ld)
|
||||
cli.LogErrf("Mingw-w64 ld linker not found: %s", ld)
|
||||
cli.LogErrf("Specify path to Mingw-w64 ld: `--mingw-w64-ld <path>`")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -75,12 +76,13 @@ func MingwGcc(params ...string) string {
|
||||
gcc = "x86_64-w64-mingw32-gcc"
|
||||
|
||||
if IsWindows() {
|
||||
gcc += ".exe"
|
||||
gcc = "gcc.exe"
|
||||
}
|
||||
}
|
||||
|
||||
if !IsProgramAvailable(gcc) {
|
||||
cli.LogErrf("Mingw-w64 GCC compiler not found: %s", gcc)
|
||||
cli.LogErrf("Specify path to Mingw-w64 GCC: `--mingw-w64-gcc <path>`")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -95,12 +97,13 @@ func MingwObjcopy(params ...string) string {
|
||||
objcopy = "x86_64-w64-mingw32-objcopy"
|
||||
|
||||
if IsWindows() {
|
||||
objcopy += ".exe"
|
||||
objcopy = "objcopy.exe"
|
||||
}
|
||||
}
|
||||
|
||||
if !IsProgramAvailable(objcopy) {
|
||||
cli.LogErrf("Mingw-w64 objcopy tool not found: %s\n", objcopy)
|
||||
cli.LogErrf("Mingw-w64 objcopy tool not found: %s", objcopy)
|
||||
cli.LogErrf("Specify path to Mingw-w64 objcopy: `--mingw-w64-objcopy <path>`")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user