diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
| commit | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (patch) | |
| tree | 484b5075ff9c977dd29679c87f6eaa08144b292f /BuildParams | |
| parent | b1d608ee99824fde13f3f16e0947ec5b54299fca (diff) | |
| parent | 2dc4f8f8e98da565c158ec9947fe96eccd4920e9 (diff) | |
Merge 3.5.1 into Materials
Diffstat (limited to 'BuildParams')
| -rwxr-xr-x[-rw-r--r--] | BuildParams | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams index c4f50097a9..1223db6981 100644..100755 --- 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 # ======================================== @@ -59,6 +64,7 @@ viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true viewer-release.codeticket_add_context = false + # ======================================== # mesh-development # ======================================== |