summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2013-07-04 11:23:53 +0100
committerRichard Dale <richard.dale@codethink.co.uk>2013-07-04 11:23:53 +0100
commit76f4ef510f7c8c41a4f7515934940f5de6021c52 (patch)
tree6eb38829ccf809de76fc85529ab9b0be3a3c59eb
parent326f1edcfb066383a02f3895878b8c9b8309706f (diff)
downloadqt4-tools-76f4ef510f7c8c41a4f7515934940f5de6021c52.tar.gz
Fix from James Thomas to build correctly on Intel
-rw-r--r--qt4-tools.morph2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt4-tools.morph b/qt4-tools.morph
index 6bac5cd3d8..6e104d9f90 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -2,7 +2,7 @@
"name": "qt4-tools",
"kind": "chunk",
"configure-commands": [
- "arch=$(uname -m) && [ \"${arch}\" != \"${arch//arm/}\" ] && sed 's/g++-unix.conf)/&\\nQMAKE_CXXFLAGS += -fno-strict-volatile-bitfields/' -i mkspecs/linux-g++/qmake.conf",
+ "arch=$(uname -m); if [ \"${arch}\" != \"${arch//arm/}\" ]; then sed 's/g++-unix.conf)/&\nQMAKE_CXXFLAGS += -fno-strict-volatile-bitfields/' -i mkspecs/linux-g++/qmake.conf; else echo Running on x86, not modifying qmake.conf; fi",
"./configure -v -prefix /usr -opensource -confirm-license"
],
"build-commands": [