ansible: add gcc 4.9 to the cross compiling machine (#1094)

nodejs · Apr 3, 2018 · 6bd9147 · 6bd9147
1 parent 9a58175
commit 6bd9147
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/...le/roles/cross-compiler/files/cc-armv6.sh → ...oles/cross-compiler/files/cc-armv6-4.8.sh b/...le/roles/cross-compiler/files/cc-armv6.sh → ...oles/cross-compiler/files/cc-armv6-4.8.sh
diff --git a/ansible/roles/cross-compiler/files/cc-armv6-4.9.sh b/ansible/roles/cross-compiler/files/cc-armv6-4.9.sh
@@ -0,0 +1,4 @@
+export CC_host='ccache gcc-4.9 -m32'
+export CXX_host='ccache g++-4.9 -m32'
+export CC="ccache /opt/raspberrypi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc -march=armv6zk"
+export CXX="ccache /opt/raspberrypi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -march=armv6zk"
diff --git a/...le/roles/cross-compiler/files/cc-armv7.sh → ...oles/cross-compiler/files/cc-armv7-4.8.sh b/...le/roles/cross-compiler/files/cc-armv7.sh → ...oles/cross-compiler/files/cc-armv7-4.8.sh
diff --git a/ansible/roles/cross-compiler/files/cc-armv7-4.9.sh b/ansible/roles/cross-compiler/files/cc-armv7-4.9.sh
@@ -0,0 +1,4 @@
+export CC_host='ccache gcc-4.9 -m32'
+export CXX_host='ccache g++-4.9 -m32'
+export CC="ccache /opt/raspberrypi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc -march=armv7-a"
+export CXX="ccache /opt/raspberrypi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -march=armv7-a"
diff --git a/ansible/roles/cross-compiler/tasks/main.yml b/ansible/roles/cross-compiler/tasks/main.yml
@@ -31,16 +31,28 @@
     repo: https://github.com/raspberrypi/tools.git
     dest: /opt/raspberrypi/tools
 
-- name: Raspberry | Copy cc-armv6.sh script
+- name: Raspberry | Copy cc-armv6-4.8.sh script
   copy:
-    src: ./files/cc-armv6.sh
-    dest: /opt/raspberrypi/cc-armv6.sh
+    src: ./files/cc-armv6-4.8.sh
+    dest: /opt/raspberrypi/cc-armv6-4.8.sh
     mode: 0755
 
-- name: Raspberry | Copy cc-armv7.sh script
+- name: Raspberry | Copy cc-armv7-4.8.sh script
   copy:
-    src: ./files/cc-armv7.sh
-    dest: /opt/raspberrypi/cc-armv7.sh
+    src: ./files/cc-armv7-4.8.sh
+    dest: /opt/raspberrypi/cc-armv7-4.8.sh
+    mode: 0755
+
+- name: Raspberry | Copy cc-armv6-4.9.sh script
+  copy:
+    src: ./files/cc-armv6-4.9.sh
+    dest: /opt/raspberrypi/cc-armv6-4.9.sh
+    mode: 0755
+
+- name: Raspberry | Copy cc-armv7-4.9.sh script
+  copy:
+    src: ./files/cc-armv7-4.9.sh
+    dest: /opt/raspberrypi/cc-armv7-4.9.sh
     mode: 0755
 
 - name: User | Download Jenkins pubkey

diff --git a/ansible/roles/cross-compiler/vars/main.yml b/ansible/roles/cross-compiler/vars/main.yml
@@ -1,8 +1,10 @@
 ---
 
 packages:
-  - gcc-multilib
-  - g++-multilib
+  - gcc-4.8-multilib
+  - g++-4.8-multilib
+  - gcc-4.9-multilib
+  - g++-4.9-multilib
   - python-all
   - python-software-properties
   - curl