Changeset 30757 for main/trunk

Timestamp:

2016-08-26T12:48:18+12:00 (8 years ago)

Author:

davidb

Message:

Experiment to see if this helps the release on El Capitan compile. The issue we are looking at is that setting DYLD_LIBRARY_PATH at this point leads to a problem with java, because it now sees the libiconv that gnome-lib-minimal has, which turns out to be incompatible with JDK 1.7_79

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -390 +390 @@
     </else>
     </if>
-
+<!--
     <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool>
         <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool>
@@ -407 +407 @@
     </else>
     </if>
+-->
 
     <else>