on xenial help sign in
Depend on :native version of g++ to allow cross-compiling to work. Fixes: #1353855

Approved by: Michał Sawicz, PS Jenkins bot

commita642c5ce83e3048a42185a34bfef285e38b7e879 authorRodney Dawes <rodney.dawes@canonical.com> dateFri 9 Jan 2015, 10:40 (12 years ago) parent6e7ce90dab37e3
1 file changed+4−2
debian/control+4−2
debian/control+4−2
@@ -10,8 +10,10 @@ Build-Depends: cmake,
1010 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
1111# We rely on C++11 features, and to prevent from ABI breaks
1212# in libstdc++ causing us issues, we explicitly select a G++
13−# version.
14− g++-4.9,
13+# version. To allow cross-compiling to work, we also must
14+# append :native to g++-4.9 so we don't try to run armhf g++
15+# on an x86 CPU for eaxmple, when cross-compiling.
16+ g++-4.9:native,
1517 libconnectivity-qt1-dev,
1618 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1719 libgl1-mesa-dri,