aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynold Xin <rxin@apache.org>2013-09-26 14:28:55 -0700
committerReynold Xin <rxin@apache.org>2013-09-26 14:28:55 -0700
commit714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8 (patch)
tree0bc0f59dc8dac982a6dc7f6e25e1a2195cf34332
parent13eced723f222095ea4b52c4f6cb078cae66342e (diff)
parent3f283278b00fc0a98a6c8cccd704bfc476f5d765 (diff)
downloadspark-714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8.tar.gz
spark-714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8.tar.bz2
spark-714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8.zip
Merge pull request #17 from rxin/optimize
Remove -optimize flag
-rw-r--r--pom.xml1
-rw-r--r--project/SparkBuild.scala2
2 files changed, 1 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index d74d45adf1..ad5051d38a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -557,7 +557,6 @@
<useZincServer>true</useZincServer>
<args>
<arg>-unchecked</arg>
- <arg>-optimise</arg>
<arg>-deprecation</arg>
</args>
<jvmArgs>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 99cdadb9e7..aef246d8a9 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -81,7 +81,7 @@ object SparkBuild extends Build {
organization := "org.apache.spark",
version := "0.9.0-incubating-SNAPSHOT",
scalaVersion := "2.9.3",
- scalacOptions := Seq("-Xmax-classfile-name", "120", "-unchecked", "-optimize", "-deprecation",
+ scalacOptions := Seq("-Xmax-classfile-name", "120", "-unchecked", "-deprecation",
"-target:" + SCALAC_JVM_VERSION),
javacOptions := Seq("-target", JAVAC_JVM_VERSION, "-source", JAVAC_JVM_VERSION),
unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath },