Move hard-float library locations

This commit is contained in:
Will Hedgecock 2021-11-16 21:04:02 -06:00
parent 9395d29777
commit 9a2fcb26bd
5 changed files with 3 additions and 3 deletions

View File

@ -173,7 +173,7 @@ public final class SerialPort
{ {
File linkerFile = new File("/lib/ld-linux-armhf.so.3"); File linkerFile = new File("/lib/ld-linux-armhf.so.3");
if (linkerFile.exists()) if (linkerFile.exists())
libraryPath += "-hf"; libraryPath += "hf";
else else
{ {
String line; String line;
@ -182,7 +182,7 @@ public final class SerialPort
p.waitFor(); p.waitFor();
BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream())); BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
if (((line = br.readLine()) != null) && line.contains("armhf")) if (((line = br.readLine()) != null) && line.contains("armhf"))
libraryPath += "-hf"; libraryPath += "hf";
else else
{ {
pb = new ProcessBuilder("/bin/sh", "-c", "ldd /usr/bin/ld | grep ld-"); pb = new ProcessBuilder("/bin/sh", "-c", "ldd /usr/bin/ld | grep ld-");
@ -190,7 +190,7 @@ public final class SerialPort
p.waitFor(); p.waitFor();
br = new BufferedReader(new InputStreamReader(p.getInputStream())); br = new BufferedReader(new InputStreamReader(p.getInputStream()));
if (((line = br.readLine()) != null) && line.contains("armhf")) if (((line = br.readLine()) != null) && line.contains("armhf"))
libraryPath += "-hf"; libraryPath += "hf";
} }
} }
} }

Binary file not shown.

Binary file not shown.