summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-03-30 01:25:23 +0100
committerSven Gothel <[email protected]>2019-03-30 01:25:23 +0100
commit1cee337a9e888c9f223f36ffa05ceec5692bc08c (patch)
treebb0d33412c89d0007d5330074aa5d5ccf5c95ccf
parent5a66f7f505fab5526f1b8d3b8ccfa24bb5a5ceee (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.
-rwxr-xr-xmake/build.xml9
1 files changed, 0 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml
index 0c07a5c..5478392 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -375,10 +375,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" />
@@ -435,11 +431,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" />