diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index b9053a180..1c48b787d 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -72,6 +72,10 @@ packages: { 'gmake' ], + freebsd10: [ + 'clang38' + ], + smartos14: [ 'gcc48', 'gcc48-libs', diff --git a/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 b/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 index 36aa9706f..3fb2985f7 100644 --- a/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 +++ b/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 @@ -28,8 +28,8 @@ jenkins_env=" \ NODE_TEST_DIR=/home/{{ server_user }}/tmp \ PATH=/usr/local/libexec/ccache:/usr/local/bin:${PATH} \ JOBS={{ server_jobs|default(ansible_processor_vcpus|default('2')) }} \ - CC=cc \ - CXX=c++" + CC={{ 'clang38' if os == 'freebsd10' else 'cc' }} \ + CXX={{ 'clang++38' if os == 'freebsd10' else 'c++' }}" jenkins_jar="/home/{{ server_user }}/slave.jar" jenkins_log_file="/home/{{ server_user }}/${name}_console.log"