Install default gcc and not attempt to do individual versions (#2736)

* unixPB: Fix gcc package install on Ubuntu Signed-off-by: Stewart X Addison <[email protected]> * unixPB: Ubuntu: Remove gcc_compiler completely as default versions are included elsewhere Signed-off-by: Stewart X Addison <[email protected]> Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Sep 30, 2022 · d0da682 · d0da682
1 parent de2d533
commit d0da682
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
@@ -61,13 +61,6 @@
   with_items: "{{ OpenJFX_Build_Tool_Packages }}"
   tags: [build_tools, build_tools_jfx]
 
-- name: Install GCC G++ on supported platforms
-  package: "name={{ item }} state=latest"
-  with_items: "{{ gcc_compiler }}"
-  when:
-    - not (ansible_distribution_major_version >= "20")
-  tags: build_tools
-
 - name: Install additional build tools for x86
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_x86 }}"

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
@@ -62,12 +62,6 @@ OpenJFX_Build_Tool_Packages:
   - libxxf86vm-dev
   - ruby
 
-gcc_compiler:
-  - g++-4.8
-  - gcc-4.8
-  - gcc-7
-  - g++-7
-
 Additional_Packages_Ubuntu16:
   - libgstreamer0.10-dev                # OpenJFX prereq
   - libgstreamer-plugins-base0.10-dev   # OpenJFX prereq