Skip to content

Commit c7d3fd9

Browse files
committedJul 11, 2022
8283402: Update to gcc 11.2 on Linux
Reviewed-by: arapte, jvos
1 parent cbb53b2 commit c7d3fd9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed
 

‎.github/workflows/submit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ jobs:
8383
run: |
8484
set -x
8585
sudo apt-get update
86-
sudo apt-get install libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-10=10.3.0-1ubuntu1~20.04 g++-10=10.3.0-1ubuntu1~20.04
87-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
86+
sudo apt-get install libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-11 g++-11
87+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
8888
mkdir -p "${HOME}/build-tools"
8989
wget -O "${HOME}/build-tools/${ANT_FILENAME}" "${ANT_URL}"
9090
tar -zxf "${HOME}/build-tools/${ANT_FILENAME}" -C "${HOME}/build-tools"

‎build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jfx.gradle.version=7.3
8888
jfx.gradle.version.min=6.3
8989

9090
# Toolchains
91-
jfx.build.linux.gcc.version=gcc10.3.0-OL6.4+1.0
91+
jfx.build.linux.gcc.version=gcc11.2.0-OL6.4+1.0
9292
jfx.build.windows.msvc.version=VS2022-17.1.0+1.0
9393
jfx.build.macosx.xcode.version=Xcode12.4+1.0
9494

‎gradle/verification-metadata.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
<sha256 value="0018b369f06646d4784fad131a155333c9d59a03dee6390324f81b9df72a2f00" origin="Generated by Gradle"/>
8282
</artifact>
8383
</component>
84-
<component group="javafx" name="devkit-linux_x64-gcc10.3.0" version="OL6.4+1.0.tar">
85-
<artifact name="devkit-linux_x64-gcc10.3.0-OL6.4+1.0.tar.gz">
86-
<sha256 value="7bef73db375a81dd8daf8a63ee4a1f8f06dd3a063b85115e84a0dd52da22dca9" origin="Generated by Gradle"/>
84+
<component group="javafx" name="devkit-linux_x64-gcc11.2.0" version="OL6.4+1.0.tar">
85+
<artifact name="devkit-linux_x64-gcc11.2.0-OL6.4+1.0.tar.gz">
86+
<sha256 value="db9ec01e1658d06fd7e94886e004c63591c1a43ba441f027b35670bcbad89873" origin="Generated by Gradle"/>
8787
</artifact>
8888
</component>
8989
<component group="javafx" name="devkit-macosx" version="Xcode12.4+1.0.tar">

0 commit comments

Comments
 (0)
Please sign in to comment.