Commit be881d3

committed

Use llvm-objcopy to package Windows binaries

Fixes #793.

1 parent 86198bb commit be881d3Copy full SHA for be881d3

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -561,8 +561,8 @@ jobs:`
`561`	`561`	`# MacOS: use LLVM binutils for both X64 and ARM64`
`562`	`562`	`additional_flags+=(-L)`
`563`	`563`	`elif [[ "${{ matrix.sdk_platform }}" == "windows" && "${variant}" == "/x64/" ]]; then`
`564`		`- # Windows x64: force input and output target format`
`565`		`- additional_flags+=(-f pe-x86-64,pe-bigobj-x86-64)`
	`564`	`+ # Windows x64: force input and output target format and use LLVM binutils for correct objcopy (issue #793)`
	`565`	`+ additional_flags+=(-f pe-x86-64,pe-bigobj-x86-64 -L)`
`566`	`566`	`elif [[ "${{ matrix.sdk_platform }}" == "windows" && "${variant}" == "/x86/" ]]; then`
`567`	`567`	`# Windows x86: force input and output target format`
`568`	`568`	`additional_flags+=(-f pe-i386,pe-bigobj-i386)`

100644100755

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,18 @@ def main():`
`80`	`80`	`# sudo apt install clang-format`
`81`	`81`	`utils.run_command(['apt', 'install', '-y','clang-format'], as_root=True)`
`82`	`82`	`elif utils.is_mac_os():`
`83`		`- # brew install protobuf`
	`83`	`+ # brew install clang-format`
`84`	`84`	`utils.run_command(['brew', 'install', 'clang-format'])`
`85`	`85`
	`86`	`+ # Install llvm on linux/mac if its not installed already`
	`87`	`+ if not utils.is_command_installed('llvm-objcopy'):`
	`88`	`+ if utils.is_linux_os():`
	`89`	`+ # sudo apt install llvm`
	`90`	`+ utils.run_command(['apt', 'install', '-y','llvm'], as_root=True)`
	`91`	`+ elif utils.is_mac_os():`
	`92`	`+ # brew install llvm`
	`93`	`+ utils.run_command(['brew', 'install', 'llvm'])`
	`94`	`+`
`86`	`95`	`# On Linux, if gcc-10 isn't installed install it. Then make it the default.`
`87`	`96`	`if utils.is_linux_os():`
`88`	`97`	`# Check if we have gcc 9 or gcc 10 as the default, if not, set gcc 10.`

Comments

(0)