Skip to content

Commit

Permalink
Process feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
jperedadnr committed Sep 4, 2024
1 parent 077e29a commit 862cb4e
Showing 1 changed file with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ public boolean createStaticLib() throws IOException, InterruptedException {
Logger.logSevere("Error building a static library: error linking the native image");
return false;
}
ProcessRunner createStaticLibRunner = new ProcessRunner(getStaticLinker());
createStaticLibRunner.addArg(getStaticLinkerArgs());
ProcessRunner createStaticLibRunner = new ProcessRunner(getStaticArchiver());
createStaticLibRunner.addArg(getStaticArchiverArgs());
Path dest = paths.getGvmPath().resolve("lib" + projectConfiguration.getAppName() + ".a");
createStaticLibRunner.addArg(dest.toString());
createStaticLibRunner.addArg(getProjectObjectFile().toString());
Expand All @@ -335,7 +335,8 @@ public boolean createStaticLib() throws IOException, InterruptedException {
createStaticLibRunner.setLogToFile(true);
int result = createStaticLibRunner.runProcess("archive");
if (result == 0) {
// copy vmone lib to target, as it will be needed for linking
Logger.logInfo("Static library " + dest.getFileName() + " and static libraries " + JDK_LIBS + "\n" +
"were successfully added to " + paths.getGvmPath() + ".");
FileOps.copyDirectory(projectConfiguration.getJavaStaticLibsPath(), paths.getGvmPath());
}
return result == 0;
Expand Down Expand Up @@ -836,11 +837,11 @@ String getLinker() {
return "gcc";
}

String getStaticLinker() {
String getStaticArchiver() {
return "ar";
}

String getStaticLinkerArgs() {
String getStaticArchiverArgs() {
return "rcs";
}

Expand Down

0 comments on commit 862cb4e

Please sign in to comment.