Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8211362: Restrict export of libjpeg symbols from libjavafx_iio.so
Reviewed-by: kcr
  • Loading branch information
Johan Vos committed Mar 25, 2021
1 parent 3bbcf97 commit ed5cfe7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions buildSrc/linux.gradle
Expand Up @@ -278,8 +278,8 @@ LINUX.iio.nativeSource = [
file("${project("graphics").projectDir}/src/main/native-iio"),
file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
LINUX.iio.compiler = compiler
LINUX.iio.ccFlags = [cFlags].flatten()
LINUX.iio.linker = linker
LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten()
LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker
LINUX.iio.linkFlags = [linkFlags].flatten()
LINUX.iio.lib = "javafx_iio"

Expand Down
Expand Up @@ -40,8 +40,13 @@ class LinkTask extends DefaultTask {
project.exec({
commandLine(linker);
if ((project.IS_LINUX) && (project.IS_STATIC_BUILD)) {
args("rcs");
args("$lib");
if (linker.equals("ld")) {
args("-r");
args("-o");
} else {
args("rcs");
}
args("$lib");
}
// Exclude parfait files (.bc)
args(objectDir.listFiles().findAll{ !it.getAbsolutePath().endsWith(".bc") });
Expand Down

1 comment on commit ed5cfe7

@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.