extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-07 09:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: fix windows/amd64 build and icon/version embedding #4304

Browse Source 
The parameters were being passed to goversioninfo in the wrong order
so that the 64 bit .syso was actually a 32 bit .syso thus calling the
linker to fail.
This commit is contained in:
Nick Craig-Wood 2020-06-18 15:01:33 +01:00
parent 5e6f4ab281
commit 33c8709439
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/cross-compile.go
View File

@ -172,7 +172,7 @@ func buildDebAndRpm(dir, version, goarch string) []string {
} }
// generate system object (syso) file to be picked up by a following go build for embedding icon and version info resources into windows executable // generate system object (syso) file to be picked up by a following go build for embedding icon and version info resources into windows executable
func buildWindowsResourceSyso(goarch string, versionTag string) (string) { func buildWindowsResourceSyso(goarch string, versionTag string) string {
type M map[string]interface{} type M map[string]interface{}
version := strings.TrimPrefix(versionTag, "v") version := strings.TrimPrefix(versionTag, "v")
semanticVersion := semver.New(version) semanticVersion := semver.New(version)
@ -238,11 +238,11 @@ func buildWindowsResourceSyso(goarch string, versionTag string) (string) {
"goversioninfo", "goversioninfo",
"-o", "-o",
sysoPath, sysoPath,
jsonPath,
} }
if goarch == "amd64" { if goarch == "amd64" {
args = append(args, "-64") // Make the syso a 64-bit coff file (but does not matter, results are identical) args = append(args, "-64") // Make the syso a 64-bit coff file
} }
args = append(args, jsonPath)
err = runEnv(args, nil) err = runEnv(args, nil)
if err != nil { if err != nil {
return "" return ""

2
bin/win-build.bat
View File

@ -2,5 +2,5 @@
echo Setting environment variables for mingw+WinFsp compile echo Setting environment variables for mingw+WinFsp compile
set GOPATH=Z:\go set GOPATH=Z:\go
rem set PATH=C:\Program Files\mingw-w64\i686-7.1.0-win32-dwarf-rt_v5-rev0\mingw32\bin;%PATH% rem set PATH=C:\Program Files\mingw-w64\i686-7.1.0-win32-dwarf-rt_v5-rev0\mingw32\bin;%PATH%
set PATH=C:\Program Files\mingw-w64\x86_64-8.1.0-win32-seh-rt_v6-rev0\mingw64\bin;%PATH% set PATH=C:\Program Files\mingw-w64\x86_64-8.1.0-win32-seh-rt_v6-rev0\mingw64\bin;%GOPATH%/bin;%PATH%
set CPATH=C:\Program Files\WinFsp\inc\fuse;C:\Program Files (x86)\WinFsp\inc\fuse set CPATH=C:\Program Files\WinFsp\inc\fuse;C:\Program Files (x86)\WinFsp\inc\fuse