diff options
| author | Sven Gothel <[email protected]> | 2019-04-10 01:47:37 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-10 01:47:37 +0200 |
| commit | 8c4e3c5abe2dd2d6cdebe7de93a942075bf72762 (patch) | |
| tree | 345b326ae14c0bf2b982412842cb414e3a4e1a04 | |
| parent | b846476786a776296a5c5ab6cbfb370a4c5497ae (diff) | |
build.xml:gluegen.build.native: Place unsetting into the conditional .impl target
like gluegen.build.java.impl, as the .impl may be skipped.
| -rw-r--r-- | make/build.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 2fbb3f9..79ec607 100644 --- a/make/build.xml +++ b/make/build.xml @@ -431,8 +431,6 @@ </target> <target name="gluegen.build.native" depends="init, c.configure" > - <var name="gluegen.build.shasum.done" unset="true"/> - <var name="gluegen.package.native.done" unset="true"/> <property name="c.compiler.src.files.common" value="src/native/common/*.c" /> <property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" /> @@ -454,6 +452,9 @@ </target> <target name="gluegen.build.c.impl" depends="init, c.configure" unless="gluegen.build.skip.native"> + <echo message="clearing gluegen.build.shasum.done (2) - was ${gluegen.build.shasum.done}"/> + <var name="gluegen.build.shasum.done" unset="true"/> + <var name="gluegen.package.native.done" unset="true"/> <fail message="Requires '${compiler.cfg.id}'" unless="compiler.cfg.id"/> <fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/> @@ -1065,6 +1066,7 @@ </condition> </target> <target name="gluegen.build.java.impl" depends="gluegen.cpptasks.detect.os,gluegen.build.check.java" unless="gluegen.build.skip.java"> + <echo message="clearing gluegen.build.shasum.done (1) - was ${gluegen.build.shasum.done}"/> <var name="gluegen.build.shasum.done" unset="true"/> <var name="gluegen.package.java.done" unset="true"/> <antcall target="generate-hash-maps" inheritRefs="true"/> |