Index: working_vm/build/make/targets/test.common.xml =================================================================== --- working_vm/build/make/targets/test.common.xml (revision 579187) +++ working_vm/build/make/targets/test.common.xml (working copy) @@ -35,12 +35,10 @@ - + - + Index: working_vm/build/make/targets/build.java.xml =================================================================== --- working_vm/build/make/targets/build.java.xml (revision 579187) +++ working_vm/build/make/targets/build.java.xml (working copy) @@ -23,15 +23,11 @@ - - + - + Index: working_classlib/make/properties.xml =================================================================== --- working_classlib/make/properties.xml (revision 579187) +++ working_classlib/make/properties.xml (working copy) @@ -41,6 +41,11 @@ + + + + + @@ -258,8 +263,6 @@ - - @@ -313,6 +316,7 @@ hy.javac.source = ${hy.javac.source} hy.javac.debug = ${hy.javac.debug} hy.javac.maxmem = ${hy.javac.maxmem} + build.compilerarg = ${build.compilerarg} Harmony test properties: @@ -509,5 +513,12 @@ + + + + + + Index: working_classlib/make/build-java.xml =================================================================== --- working_classlib/make/build-java.xml (revision 579187) +++ working_classlib/make/build-java.xml (working copy) @@ -122,15 +122,9 @@ - - - @@ -187,7 +181,7 @@ - +