kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tweak cross compilation Make

Browse Source 
Only use cross compile if not compiling in target architecture.

Also, use the latest gcc for cross compilation.
This commit is contained in:
Mahmood Ali
2021-04-02 16:29:57 -04:00
parent 3db2f2f9f5
commit caaeaa02f7
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
GNUmakefile
View File

@@ -72,8 +72,14 @@ endif
CC=$(CC) \
go build -trimpath -ldflags $(GO_LDFLAGS) -tags "$(GO_TAGS)" -o $(GO_OUT)
pkg/linux_arm/nomad: CC = arm-linux-gnueabihf-gcc-5
pkg/linux_arm64/nomad: CC = aarch64-linux-gnu-gcc-5
ifneq (armv7l,$(THIS_ARCH))
pkg/linux_arm/nomad: CC = arm-linux-gnueabihf-gcc
endif
ifneq (aarch64,$(THIS_ARCH))
pkg/linux_arm64/nomad: CC = aarch64-linux-gnu-gcc
endif
pkg/windows_%/nomad: GO_OUT = $@.exe
# Define package targets for each of the build targets we actually have on this system

6
scripts/vagrant-linux-priv-config.sh
View File

@@ -31,9 +31,9 @@ apt-get install -y \
apt-get install -y \
binutils-aarch64-linux-gnu \
binutils-arm-linux-gnueabihf \
gcc-5-aarch64-linux-gnu \
gcc-5-arm-linux-gnueabihf \
gcc-5-multilib-arm-linux-gnueabihf
gcc-aarch64-linux-gnu \
gcc-arm-linux-gnueabihf \
gcc-multilib-arm-linux-gnueabihf
# Install Windows build utilities
apt-get install -y \