include object files into image #716
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jperedadnr
reviewed
Jul 28, 2020
| @@ -637,8 +637,8 @@ private static void writePatternEntry(BufferedWriter bw, String pattern) throws | |||
|
|
|||
| /** | |||
| * Loops over every jar on the classpath that isn't a JavaFX jar and checks | |||
| * if it contains native static libraries (*.a or *.lib files). If found, the | |||
| * libraries are extracted into a temporary folder for use in the link step. | |||
| * if it contains native static libraries (*.a or *.lib files) or object files. If found, the | |||
| @@ -654,6 +654,9 @@ private void extractNativeLibs(String classPath) throws IOException { | |||
| for (String jar : jars) { | |||
| FileOps.extractFilesFromJar("." + getStaticLibraryFileExtension(), Path.of(jar), | |||
| libPath, getTargetSpecificNativeLibsFilter()); | |||
| FileOps.extractFilesFromJar(".o" , Path.of(jar), | |||
There was a problem hiding this comment.
Use getObjectFileExtension() instead of o.
There was a problem hiding this comment.
Extract Path.of(jar) and getTargetSpecificNativeLibsFilter() to variables, as they are used twice.
There was a problem hiding this comment.
Use
getObjectFileExtension()instead ofo.
That would then fail on Windows, as that hard-coded uses ".obj" in Substrate.
There was a problem hiding this comment.
Now that #718 has been integrated, this can be refactored to include all possible file extensions, creating a list before the for with them.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for #715