summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-08 14:46:00 -0400
committerOz Linden <oz@lindenlab.com>2013-05-08 14:46:00 -0400
commit1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch)
treefb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /BuildParams
parent21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff)
parent1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff)
merge changes for 3.5.1-release
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams5
1 files changed, 5 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams
index c4f50097a9..f51aff96ba 100644
--- a/BuildParams
+++ b/BuildParams
@@ -21,6 +21,11 @@ email_status_this_is_os = true
# Limit extent of codeticket updates to revisions after...
codeticket_since = 3.3.0-release
+# Override build system default toolchain
+# Note that this will only affect automated builds.
+Linux.gcc_version = /usr/bin/gcc-4.6
+Linux.cxx_version = /usr/bin/g++-4.6
+
# ========================================
# Viewer Development
# ========================================