aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-03-30 01:28:27 +0100
committerSven Gothel <[email protected]>2019-03-30 01:28:27 +0100
commitfb03bcb97326026155f17bbb4d8a634da6d62d43 (patch)
tree5ea0f957b87311dd4718ddf8aadb21e919ccea82
parent91910792e4ba0e552e2914e6c6ae75be997314e9 (diff)
Bug 1316: MacOSX: Keep *.dylib (Don't move to *.jnilib)
Since Java8 (or even earlier), JRE on OSX uses *.dylib native library suffix instead of *.jnilib when automatically searching and loading them. This is not easily being recognized by JogAmp, since we explicitly name the native libraries with full path when testing with our TempJarCache.
-rw-r--r--make/build.xml9
1 files changed, 0 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml
index b0d4e48e..17ec8e70 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -469,10 +469,6 @@
<move file="${src}" tofile="${dest}" />
</target>
- <target name="rename.dylib" if="isOSX">
- <move file="${src}" tofile="${dest}" />
- </target>
-
<macrodef name="c.build">
<attribute name="compiler.cfg.id" />
<attribute name="linker.cfg.id" />
@@ -539,11 +535,6 @@
<linker extends="@{linker.cfg.id}" />
</cc>
- <antcall target="rename.dylib" inheritRefs="true">
- <param name="src" value="${obj}/lib@{output.lib.name}.dylib" />
- <param name="dest" value="${obj}/lib@{output.lib.name}.jnilib" />
- </antcall>
-
<antcall target="rename.mingw.dll" inheritRefs="true">
<param name="src" value="${obj}/lib@{output.lib.name}.so" />
<param name="dest" value="${obj}/@{output.lib.name}.dll" />