From c01172f6fbddad346a9a54a8b211559c1c9cd782 Mon Sep 17 00:00:00 2001
From: michelou <michelou@5e8d7ff9-d8ef-0310-90f0-a4852d11357a>
Date: Mon, 11 Jun 2007 15:23:21 +0000
Subject: [PATCH] fixed 2 quirks on .NET

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@11979 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
---
 build.xml                                     | 50 +++++++++++++------
 .../scala/tools/nsc/symtab/Definitions.scala  |  2 +-
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index 0d7ba9dcb..3646502cd 100644
--- a/build.xml
+++ b/build.xml
@@ -635,21 +635,43 @@ MSIL
   <target name="msil" depends="setup.quick, msil.sources">
     <quick srcdir="${msil.dir}/src" usepredefs="no" target="msil"
            assemname="${msil.dir}/predef" assemrefs="${lib.dir}">
-      <include name="scala/Predef.scala" />
-      <include name="scala/Console.scala" />
-      <include name="scala/Application.scala" />
-      <include name="scala/ByNameFunction.scala" />
-      <include name="scala/*Annotation.scala" />
-      <include name="scala/Function*.scala" />
-      <include name="scala/Tuple*.scala" />
-      <include name="scala/Product*.scala" />
-      <include name="scala/deprecated.scala" />
-      <include name="scala/serializable.scala" />
-      <include name="scala/transient.scala" />
-      <include name="scala/cloneable.scala" />
-      <include name="scala/transient.scala" />
-      <include name="scala/runtime/*.scala" />
+      <include name="scala/Predef.scala"/>
+      <include name="scala/Console.scala"/>
+      <include name="scala/Application.scala"/>
+      <include name="scala/ByNameFunction.scala"/>
+      <include name="scala/*Annotation.scala"/>
+      <include name="scala/Function*.scala"/>
+      <include name="scala/Tuple*.scala"/>
+      <include name="scala/Product*.scala"/>
+      <include name="scala/cloneable.scala"/>
+      <include name="scala/deprecated.scala"/>
+      <include name="scala/serializable.scala"/>
+      <include name="scala/transient.scala"/>
+      <include name="scala/runtime/*.scala"/>
     </quick>
+    <property name="ilasm.infile" value="${msil.dir}/predef.msil"/>
+    <property name="ilasm.outfile" value="${msil.dir}/predef.dll"/>
+    <if><isset property="os.win"/>
+      <then>
+        <property
+          name="ilasm.args"
+          value="/quiet /dll /output=${ilasm.outfile} ${ilasm.infile}"
+        />
+      </then>
+      <else>
+        <property
+          name="ilasm.args"
+          value="/dll /output:${ilasm.outfile} ${ilasm.infile}"
+        />
+      </else>
+    </if>
+    <exec
+      executable="ilasm" vmlauncher="no">
+      <!--
+      errorproperty="ilasm.err" outputproperty="ilasm.out">
+      -->
+      <arg line="${ilasm.args}"/>
+    </exec>
   </target>
 
 <!-- ===========================================================================
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 44d20a07f..c03c428f3 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -939,7 +939,7 @@ trait Definitions {
       SerializableAttr = getClass("scala.serializable")
       BeanPropertyAttr = if (forCLDC || forMSIL) null else getClass("scala.reflect.BeanProperty")
       DeprecatedAttr = getClass("scala.deprecated")
-      NativeAttr     = getClass("scala.native")
+      NativeAttr = if (forMSIL) null else getClass("scala.native")
       
       SyntheticClasses = new HashSet[Symbol]
       SyntheticClasses ++= List(