Skip to content

Commit b1fa6b3

Browse files
authored
Merge pull request #59 from whittlec/master
Use the linux64 platform when run on 64-bit Linux.
2 parents da2e02a + 6572b57 commit b1fa6b3

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,14 +586,21 @@ private void retrieveBinaryBits(Artifact a) throws MojoExecutionException {
586586
private Artifact chooseBinaryBits() throws MojoExecutionException {
587587
String plat;
588588
String os = System.getProperty("os.name");
589+
String arch = System.getProperty("os.arch");
589590
getLog().debug("OS = " + os);
591+
getLog().debug("Architecture = " + arch);
590592

591593
// See here for possible values of os.name:
592594
// http://lopica.sourceforge.net/os.html
593595
if (os.startsWith("Windows")) {
594596
plat = "win32";
595597
} else if ("Linux".equals(os)) {
596-
plat = "linux";
598+
if ("amd64".equals(arch)) {
599+
plat = "linux64";
600+
}
601+
else {
602+
plat = "linux";
603+
}
597604
} else if ("Solaris".equals(os) || "SunOS".equals(os)) {
598605
plat = "solaris";
599606
} else if ("Mac OS X".equals(os) || "Darwin".equals(os)) {

0 commit comments

Comments
 (0)