Skip to content
Snippets Groups Projects
Commit f1545226 authored by Simon McVittie's avatar Simon McVittie
Browse files

build: Compile using gcc-4.8 on scout


scout defaults to gcc 4.6, but that version produces spurious warnings
for g_set_object().

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 02cd6d37
No related branches found
No related tags found
1 merge request!170Preparation for input portal
...@@ -6,6 +6,7 @@ Standards-Version: 4.3.0 ...@@ -6,6 +6,7 @@ Standards-Version: 4.3.0
Build-Depends: Build-Depends:
debhelper (>= 9), debhelper (>= 9),
g++ (>= 4:4.8) | g++-4.8, g++ (>= 4:4.8) | g++-4.8,
gcc (>= 4:4.8) | gcc-4.8,
glslang-tools, glslang-tools,
gtk-doc-tools <!nodoc>, gtk-doc-tools <!nodoc>,
libcapsule-tools, libcapsule-tools,
......
...@@ -147,6 +147,7 @@ build:devel: ...@@ -147,6 +147,7 @@ build:devel:
${NULL+} ${NULL+}
# g++ 4.6 is too old (see also debian/rules) # g++ 4.6 is too old (see also debian/rules)
export CC=gcc-4.8
export CXX=g++-4.8 export CXX=g++-4.8
mkdir -p -m700 "${STEAM_CI_TMPDIR}" mkdir -p -m700 "${STEAM_CI_TMPDIR}"
......
...@@ -8,6 +8,7 @@ export LC_ALL=C.UTF-8 ...@@ -8,6 +8,7 @@ export LC_ALL=C.UTF-8
include /usr/share/dpkg/default.mk include /usr/share/dpkg/default.mk
ifeq ($(shell dpkg --compare-versions `c++ -dumpversion || echo 0` ge 4.8 || echo old),old) ifeq ($(shell dpkg --compare-versions `c++ -dumpversion || echo 0` ge 4.8 || echo old),old)
export CC = gcc-4.8
export CXX = g++-4.8 export CXX = g++-4.8
endif endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment