Changeset 12675 for trunk/abcl/build.xml

Timestamp:

05/13/10 16:38:10 (13 years ago)

Author:

Mark Evenson

Message:

Fix build from scratch breakage in r12673.

File:

• trunk/abcl/build.xml (modified) (2 diffs)

trunk/abcl/build.xml

@@ -242 +242 @@
         <jvmarg value="-Dabcl.home=${abcl.home.dir}${file.separator}"/>
   <arg value="--noinit"/>
+        <arg value="--nosystem"/>
         <arg value="--eval"/>
         <arg value="(setf *load-verbose* t)"/>
@@ -279 +280 @@
 
     <target name="abcl.system.uptodate">
-      <uptodate property="abcl.system.needs-update.p" 
+      <condition property="abcl.system.needs-update.p">
+        <and>
+          <available file="${system.lisp.file}"/>
+          <available file="${abcl.startup.file}"/>
+          <uptodate
                 srcfile="${system.lisp.file}"
                 targetfile="${abcl.startup.file}"/>
+        </and>
+      </condition>
     </target>
     
-    <target name="abcl.system.update.maybe" depends="abcl.system.uptodate" if="abcl.system.needs-update.p">
+    <target name="abcl.system.update.maybe" depends="abcl.system.uptodate" 
+            if="abcl.system.needs-update.p">
       <touch file="${src.dir}/org/armedbear/lisp/compile-system.lisp"/>
     </target>