summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-04-06 09:52:48 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-04-06 09:52:48 +0000
commit9f6cd99bb9061abfaf7ff3929870aaaaa0b637ed (patch)
tree47294dcc67ce7778adfabdf5b08ac7a15eef5a7e
parent39e98930fdda284ccd02b20bb57419039790f0a8 (diff)
INTEGRATION: CWS gcj4 (1.4.12); FILE MERGED
2005/04/04 08:10:29 cmc 1.4.12.1: #i46582# rhino is buildable with gcj 4.0.0 now, so scripting can use it as well
-rwxr-xr-xscripting/java/makefile.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk
index 83c8638aa246..ed5cc4499698 100755
--- a/scripting/java/makefile.mk
+++ b/scripting/java/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: obo $ $Date: 2005-01-25 15:09:31 $
+# last change: $Author: hr $ $Date: 2005-04-06 10:52:48 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -67,10 +67,5 @@ TARGET=scriptruntimeforjava
.INCLUDE : ant.mk
.IF "$(SOLAR_JAVA)"!=""
-.IF "$(JDK)"=="gcj"
-all:
- @echo This dir cannot be build with gcj because of org.mozilla.javascript.EcmaError
-.ELSE
ALLTAR : ANTBUILD
.ENDIF
-.ENDIF