summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2017-11-09 13:28:38 +0300
committerDmitry Shachnev <mitya57@gmail.com>2017-11-09 13:28:38 +0300
commitcb843d8369c2c78a8d795076c98cd5018ed255d5 (patch)
treede3556fd83421b766c5a675359c9db679b02ee98
parenta3ab427f04c1486630b517f5d3060157ccb02b90 (diff)
downloadqtbase-cb843d8369c2c78a8d795076c98cd5018ed255d5.tar.gz
Minor fixes for the previous commit.
Support overriding CC and CXX, use single quotes for readability.
-rwxr-xr-xdebian/rules6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules
index 88b76b3..43bbcd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -264,9 +264,9 @@ endif
echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
echo "exec /usr/lib/qt5/bin/qmake" \
"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \
- "QMAKE_CC=$(DEB_HOST_GNU_TYPE)-gcc" \
- "QMAKE_CXX=$(DEB_HOST_GNU_TYPE)-g++" \
- 'QMAKE_LINK="\\$$(CXX)"' \
+ 'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
+ 'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
+ "QMAKE_LINK='\$$(CXX)'" \
"PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \
'"$$@"' \
>> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake