configure.inc: little fix

tvheadend · Mar 26, 2016 · da3cc12 · da3cc12
1 parent 3c2226d
commit da3cc12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
@@ -154,6 +154,12 @@ ifneq (,$(DEB_BUILD_GNU_TYPE))
 LIBX264_HOST := --host=$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifeq (,$(LIBX264_HOST))
+ifneq (,$(filter i386 i486 i586 i686 pentium,$(ARCH)))
+LIBX264_HOST := --host=$(ARCH)-linux-gnu
+endif
+endif
+
 $(LIB_ROOT)/$(LIBX264)/.tvh_download:
 	$(call DOWNLOAD,$(LIBX264_URL),$(LIB_ROOT)/$(LIBX264_TB),$(LIBX264_SHA1))
 	$(call UNTAR,$(LIBX264_TB),j)

diff --git a/support/configure.inc b/support/configure.inc
@@ -19,7 +19,7 @@ CONFIGURE_ARGS="$*"
 # System setup
 [ -z "$PLATFORM" ] && PLATFORM=$(uname -s | tr "[:upper:]" "[:lower:]")
 [ -z "$CPU"      ] && CPU=generic
-[ -z "$ARCH"     ] && ARCH=$(CC -dumpmachine | cut -d '-' -f 1)
+[ -z "$ARCH"     ] && ARCH=$($CC -dumpmachine | cut -d '-' -f 1)
 [ -z "$ARCH"     ] && ARCH=$(uname -m)
 [ -z "$OSENV"    ] && OSENV=posix
 [ -z "$PYTHON"   ] && PYTHON=python