Added --debug-build configure option.

configure

@@ -93,6 +93,7 @@ class Configure
     @dtrace       = false
     @have_lchmod  = false
     @have_lchown  = false
+    @debug_build  = false
     @include_dirs = []
     @lib_dirs     = []
 
@@ -336,6 +337,10 @@ class Configure
       @gem = name
     end
 
+    o.on "--debug-build", "Disable C++ optimizations and retain debugging symbols" do
+      @debug_build = true
+    end
+
     o.on "--release-build", "Build from local files instead of accessing the network" do
       @release_build = true
     end
@@ -1727,6 +1732,7 @@ int main() { return tgetnum(""); }
       :x86_64             => @x86_64,
       :dtrace             => @dtrace,
       :fibers             => @fibers,
+      :debug_build        => @debug_build,
       :sourcedir          => @sourcedir,
       :stagingdir         => @stagingdir,
       :build_prefix       => @build_prefix,
@@ -1807,6 +1813,7 @@ int main() { return tgetnum(""); }
 #define RBX_LIBC             "#{@libc}"
 #define RBX_HAVE_LCHMOD      #{@have_lchmod}
 #define RBX_HAVE_LCHOWN      #{@have_lchown}
+#define RBX_DEBUG_BUILD      #{@debug_build.inspect}
       EOC
 
       if @little_endian

kernel/delta/rubinius.rb

@@ -226,6 +226,8 @@ def self.version
       end
     end
 
+    extra << "D" if Rubinius::DEBUG_BUILD
+
     str = "rubinius #{VERSION} (#{RUBY_VERSION} #{BUILD_REV[0..7]} #{RUBY_RELEASE_DATE}"
 
     unless extra.empty?

rakelib/blueprint.rb

@@ -29,7 +29,7 @@
   gcc.cxxflags << Rubinius::BUILD_CONFIG[:system_cxxflags]
   gcc.cxxflags << Rubinius::BUILD_CONFIG[:user_cxxflags]
 
-  if ENV['DEV']
+  if Rubinius::BUILD_CONFIG[:debug_build]
     gcc.cflags << "-O0"
     gcc.mtime_only = true
   else

rakelib/package.rb

@@ -103,8 +103,10 @@ def build
     sh "./configure #{config}"
     load_configuration
 
-    sh "rake -q clean; rake -q build"
-    sh "strip -S #{BUILD_CONFIG[:build_exe]}"
+    sh "rake -q clean"
+    sh "rake -q build"
+
+    sh "strip -S #{BUILD_CONFIG[:build_exe]}" unless BUILD_CONFIG[:debug_build]
 
     if bin
       sh "mkdir -p #{root}#{File.dirname(bin)}"

vm/ontology.cpp

@@ -487,6 +487,7 @@ namespace rubinius {
     G(rubinius)->set_const(state, "LIB_VERSION", String::create(state, RBX_LIB_VERSION));
     G(rubinius)->set_const(state, "BUILD_REV", String::create(state, RBX_BUILD_REV));
     G(rubinius)->set_const(state, "RELEASE_DATE", String::create(state, RBX_RELEASE_DATE));
+    G(rubinius)->set_const(state, "DEBUG_BUILD", RBOOL(RBX_DEBUG_BUILD));
     G(rubinius)->set_const(state, "LDSHARED", String::create(state, RBX_LDSHARED));
     G(rubinius)->set_const(state, "LDSHAREDXX", String::create(state, RBX_LDSHAREDXX));