summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-10-04 15:36:52 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-10-04 15:36:52 -0400
commit6f5790da38b3005292d3dbeaad778ea740110e33 (patch)
treeb28ce7a7a158f72f4dbfda60bafff2317c671837 /BuildParams
parent56e2f11417183d8dcc3d681f79fc63446b236abb (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
Merge. Pull in viewer-release after 3.6.7 release.
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams1
1 files changed, 1 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams
index 327530934d..9752e5298d 100755
--- a/BuildParams
+++ b/BuildParams
@@ -23,6 +23,7 @@ codeticket_since = 3.3.0-release
# Override build system default toolchain
# Note that this will only affect automated builds.
+Linux.distcc_version =
Linux.gcc_version = /usr/bin/gcc-4.6
Linux.cxx_version = /usr/bin/g++-4.6