Skip to content

Commit

Permalink
8307316: Let JavaFX be built on unknown architectures
Browse files Browse the repository at this point in the history
Reviewed-by: kcr
  • Loading branch information
jgneff committed Aug 11, 2023
1 parent 8998b2d commit bedb964
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -368,11 +368,11 @@ ext.MAVEN_GROUP_ID = "org.openjfx"
// such and we could probably make it work.
if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("Unsupported build OS ${OS_NAME}")
if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
fail("Unknown and unsupported build architecture: $OS_ARCH")
logger.warn("Unknown and unsupported build architecture: $OS_ARCH")
} else if (IS_MAC && OS_ARCH != "x86_64" && OS_ARCH != "aarch64") {
fail("Unknown and unsupported build architecture: $OS_ARCH")
logger.warn("Unknown and unsupported build architecture: $OS_ARCH")
} else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64" && !IS_AARCH64 && !IS_LOONGARCH64 && !IS_RISCV64) {
fail("Unknown and unsupported build architecture: $OS_ARCH")
logger.warn("Unknown and unsupported build architecture: $OS_ARCH")
}

if (IS_64) {
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/linux.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def commonFlags = [
"-fstack-protector",
"-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=trampolines"] // warning flags

if (!IS_64) {
if (OS_ARCH == "i386") {
commonFlags += "-m32"
}

Expand Down
5 changes: 5 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
<sha256 value="ff48e1c05fd5e3701b53fc9ac59a2745d61daf1484d9aa24dc2f79a74e381cf8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="" name="org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512" version="">
<artifact name="org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512-.jar">
<sha256 value="3011a9779c3f4fc4568b621f65cfbd5f3722d0cb4dcd28bb5be2ff3441046fc9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="" name="org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512" version="">
<artifact name="org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512-.jar">
<sha256 value="a963351d5f7b82b890c4994e158d80555dae38b00af3b8d73f3875c21ff398bc" origin="Generated by Gradle"/>
Expand Down

1 comment on commit bedb964

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.