Skip to content

Commit c14b88d

Browse files
committed
Restore asterisk expansion in ImageClasspath property of macro options
1 parent 3a2c6d9 commit c14b88d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/MacroOptionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private void applyEnabled(MacroOption.EnabledOption enabledOption, String argume
9898
boolean explicitImageModulePath = enabledOption.forEachPropertyValue(config,
9999
"ImageModulePath", entry -> nativeImage.addImageModulePath(Path.of((entry))), PATH_SEPARATOR_REGEX);
100100
boolean explicitImageClasspath = enabledOption.forEachPropertyValue(config,
101-
"ImageClasspath", entry -> nativeImage.addImageClasspath(Path.of((entry))), PATH_SEPARATOR_REGEX);
101+
"ImageClasspath", entry -> NativeImage.expandAsteriskClassPathElement(entry).forEach(nativeImage::addImageClasspath), PATH_SEPARATOR_REGEX);
102102
if (!explicitImageModulePath && !explicitImageClasspath) {
103103
NativeImage.getJars(imageJarsDirectory).forEach(nativeImage::addImageClasspath);
104104
}

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1690,7 +1690,7 @@ void addCustomImageClasspath(String classpath) {
16901690
}
16911691
}
16921692

1693-
public List<Path> expandAsteriskClassPathElement(String cp) {
1693+
public static List<Path> expandAsteriskClassPathElement(String cp) {
16941694
String separators = Pattern.quote(File.separator);
16951695
if (OS.getCurrent().equals(OS.WINDOWS)) {
16961696
separators += "/"; /* on Windows also / is accepted as valid separator */

0 commit comments

Comments
 (0)