Skip to content

Commit e451df0

Browse files
committed
ansible: install clang38 on freebsd10 hosts
* Install the clang38 package on freebsd10 hosts * Updated the freebsd init template to allow configuration of the CC and CXX environment variables * Added CC/CXX configuration for freebsd10 hosts
1 parent 1512c6c commit e451df0

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

ansible/ansible.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ ansible_python_interpreter = /opt/local/bin/python
2828

2929
[hosts:freebsd]
3030
ansible_python_interpreter = /usr/local/bin/python
31+
32+
[hosts:freebsd10]
33+
custom_cc_command = clang38
34+
custom_cxx_command = clang++38

ansible/roles/baselayout/vars/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ packages: {
7272
'gmake'
7373
],
7474

75+
freebsd10: [
76+
'clang38'
77+
],
78+
7579
smartos14: [
7680
'gcc48',
7781
'gcc48-libs',

ansible/roles/jenkins-worker/templates/freebsd.initd.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jenkins_env=" \
2828
NODE_TEST_DIR=/home/{{ server_user }}/tmp \
2929
PATH=/usr/local/libexec/ccache:/usr/local/bin:${PATH} \
3030
JOBS={{ server_jobs|default(ansible_processor_vcpus|default('2')) }} \
31-
CC=cc \
32-
CXX=c++"
31+
CC={{ custom_cc_command|default('cc') }} \
32+
CXX={{ custom_cxx_command|default('c++') }}"
3333

3434
jenkins_jar="/home/{{ server_user }}/slave.jar"
3535
jenkins_log_file="/home/{{ server_user }}/${name}_console.log"

0 commit comments

Comments
 (0)