Support building a Linux armv6 binary

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
docker · Jul 28, 2016 · 632d3b9 · 632d3b9
1 parent e093b15
commit 632d3b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ env:
     - TARGET_OS=linux TARGET_ARCH=amd64 TARGETS="build validate"
     - TARGET_OS=darwin TARGET_ARCH=amd64 TARGETS="build-x"
     - TARGET_OS=windows TARGET_ARCH=amd64 TARGETS="build-x"
+    - TARGET_OS=linux TARGET_ARCH=arm TARGETS="build-x"
 script:
     - USE_CONTAINER=true make "$TARGETS"
     - "[[ \"$(find bin -type f -name docker-machine*)\" != \"\" ]]"
diff --git a/Makefile.inc b/Makefile.inc
@@ -22,7 +22,7 @@ ifeq ($(TARGET_OS),)
 endif
 
 ifeq ($(TARGET_ARCH),)
-  TARGET_ARCH := amd64 386
+  TARGET_ARCH := amd64 arm 386
 endif
 
 # Output prefix, defaults to local directory if not specified

diff --git a/mk/build.mk b/mk/build.mk
@@ -1,13 +1,14 @@
 extension = $(patsubst windows,.exe,$(filter windows,$(1)))
 
 # Valid target combinations
-VALID_OS_ARCH := "[darwin/amd64][linux/amd64][windows/amd64][windows/386]"
+VALID_OS_ARCH := "[darwin/amd64][linux/amd64][linux/arm][windows/amd64][windows/386]"
 
 os.darwin := Darwin
 os.linux := Linux
 os.windows := Windows
 
 arch.amd64 := x86_64
+arch.arm := armhf
 arch.386 := i386
 
 define gocross