Merge pull request #2297 from hashicorp/b-fix-arm-build

Fix 32bit arm build
hashicorp · Feb 9, 2017 · a703bcf · a703bcf
2 parents c1bc077 + 5bb805c
commit a703bcf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -20,7 +20,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential curl git-
      liblxc1 lxc-dev lxc-templates                      \
      gcc-5-aarch64-linux-gnu binutils-aarch64-linux-gnu \
      libc6-dev-i386 linux-libc-dev:i386                 \
-     gcc-5-arm-linux-gnueabi gcc-5-multilib-arm-linux-gnueabi binutils-arm-linux-gnueabi
+     gcc-5-arm-linux-gnueabihf gcc-5-multilib-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
 
 # Setup go, for development of Nomad
 SRCROOT="/opt/go"

diff --git a/build_linux_arm.go b/build_linux_arm.go
@@ -0,0 +1,5 @@
+// +build linux,cgo
+
+// #cgo LDFLAGS: -mfloat-abi=hard
+
+package main
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -33,7 +33,7 @@ if [[ $(uname) == "Linux" ]]; then
     CGO_ENBALED=1 GOARCH="amd64" GOOS="linux"   go build -ldflags "-X $LDFLAG" -o "pkg/linux_amd64-lxc/nomad" -tags "lxc"
 
     echo "==> Building linux arm..."
-    CC="arm-linux-gnueabi-gcc-5" GOOS=linux GOARCH="arm"   CGO_ENABLED=1 go build -ldflags "-X $LDFLAG" -o "pkg/linux_arm/nomad"
+    CC="arm-linux-gnueabihf-gcc-5" GOOS=linux GOARCH="arm"  CGO_ENABLED=1 go build -ldflags "-X $LDFLAG" -o "pkg/linux_arm/nomad"
 
     echo "==> Building linux arm64..."
     CC="aarch64-linux-gnu-gcc-5"  GOOS=linux GOARCH="arm64" CGO_ENABLED=1 go build -ldflags "-X $LDFLAG" -o "pkg/linux_arm64/nomad"