add 'linkerArgs' config option (#1103)

* add 'linkerArgs' config option * update copyright year
gluonhq · Feb 3, 2022 · a42b3d2 · a42b3d2
1 parent e6638d4
commit a42b3d2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/main/java/com/gluonhq/substrate/ProjectConfiguration.java b/src/main/java/com/gluonhq/substrate/ProjectConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Gluon
+ * Copyright (c) 2019, 2022, Gluon
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,6 +58,7 @@ public class ProjectConfiguration {
     private List<String> reflectionList = Collections.emptyList();
     private List<String> jniList = Collections.emptyList();
     private List<String> compilerArgs = Collections.emptyList();
+    private List<String> linkerArgs = Collections.emptyList();
     private List<String> runtimeArgs = Collections.emptyList();
 
     private String appId;
@@ -236,6 +237,19 @@ public void setCompilerArgs(List<String> compilerArgs) {
         this.compilerArgs = compilerArgs;
     }
 
+    public List<String> getLinkerArgs() {
+        return linkerArgs;
+    }
+
+    /**
+     * Sets an additional list of linker arguments that will be added to the linker command "as is",
+     * without any form of validation on these arguments.
+     * @param linkerArgs a list of additional linker arguments.
+     */
+    public void setLinkerArgs(List<String> linkerArgs) {
+        this.linkerArgs = linkerArgs;
+    }
+
     /**
      * Sets additional lists
      * @param runtimeArgs a list of optional runtime arguments

diff --git a/src/main/java/com/gluonhq/substrate/model/InternalProjectConfiguration.java b/src/main/java/com/gluonhq/substrate/model/InternalProjectConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Gluon
+ * Copyright (c) 2019, 2022, Gluon
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -380,6 +380,11 @@ public List<String> getCompilerArgs() {
                 .orElse(Collections.emptyList());
     }
 
+    public List<String> getLinkerArgs() {
+        return Optional.ofNullable(publicConfig.getLinkerArgs())
+                .orElse(Collections.emptyList());
+    }
+
     public List<String> getInitBuildTimeList() {
         return initBuildTimeList;
     }

diff --git a/src/main/java/com/gluonhq/substrate/target/AbstractTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/AbstractTargetConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Gluon
+ * Copyright (c) 2019, 2022, Gluon
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -223,6 +223,7 @@ public boolean link() throws IOException, InterruptedException {
 
         linkRunner.addArgs(getLinkerLibraryPathFlags());
         linkRunner.addArgs(getNativeLibsLinkFlags());
+        linkRunner.addArgs(projectConfiguration.getLinkerArgs());
         linkRunner.setInfo(true);
         linkRunner.setLogToFile(true);
         int result = linkRunner.runProcess("link");