[SCM] ffmpeg/master: Only set CC/CXX if they differ from the default

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9c445425020787a9716f759ed3532ff803fc7025
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Oct 11 21:05:43 2016 +0200

    Only set CC/CXX if they differ from the default

diff --git a/debian/rules b/debian/rules
index bb7c296..d4637b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,6 @@ CONFIG := --prefix=/usr \
 	--toolchain=hardened \
 	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	--incdir=/usr/include/$(DEB_HOST_MULTIARCH) \
-	--cc=$(CC) \
-	--cxx=$(CXX) \
 	--enable-gpl \
 	--enable-shared \
 	--disable-libtesseract \
@@ -116,6 +114,15 @@ ifneq (,$(filter $(DEB_BUILD_OPTIONS),noopt))
 	CONFIG += --disable-optimizations
 endif
 
+# Respect CC/CXX from the environment, if they differ from the default.
+# Don't set them if they equal the default, because that disables autodetection needed for cross-building.
+ifneq ($(CC),cc)
+	CONFIG += --cc=$(CC)
+endif
+ifneq ($(CXX),g++)
+	CONFIG += --cxx=$(CXX)
+endif
+
 # Some libraries are built only on linux.
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	CONFIG += --enable-libdc1394 \

-- 
ffmpeg packaging