From fbb60a5d3c73db349e53813c061e01a4050b16a6 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Mon, 25 Apr 2011 23:14:38 +0000
Subject: [PATCH] fix bug...

---
 Robust/src/IR/TypeUtil.java | 4 ++--
 Robust/src/buildscript      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Robust/src/IR/TypeUtil.java b/Robust/src/IR/TypeUtil.java
index 43c2076e..c7a468ab 100644
--- a/Robust/src/IR/TypeUtil.java
+++ b/Robust/src/IR/TypeUtil.java
@@ -148,6 +148,7 @@ public class TypeUtil {
   public MethodDescriptor getMain() {
     ClassDescriptor cd=getMainClass();
     Set mainset=cd.getMethodTable().getSet("main");
+
     for(Iterator mainit=mainset.iterator(); mainit.hasNext();) {
       MethodDescriptor md=(MethodDescriptor)mainit.next();
       if (md.numParameters()!=1)
@@ -157,9 +158,8 @@ public class TypeUtil {
                           .getType();
       if (tpd.getArrayCount()!=1)
 	continue;
-      if (!tpd.getSymbol().equals("String"))
+      if (!tpd.getSymbol().equals(StringClass))
 	continue;
-
       if (!md.getModifiers().isStatic())
 	throw new Error("Error: Non static main");
       return md;
diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 25d2a99e..d95fa20d 100755
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -767,7 +767,7 @@ fi
 # Setup class path
 if $JNI
 then
-JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/"
+JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/ $ROBUSTROOT/classpath/vm/reference"
 elif $MGCINTELFLAG
 then
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC/ -classlibrary $ROBUSTROOT/ClassLibrary/MGC/gnu/"
-- 
2.34.1