summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 01:12:41 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 01:12:41 +0000
commit6d74458037fd11612af429f95482a14cfa7d1381 (patch)
treef49a6cb00fef7b5d1500011b9a448df98586f0df
parenta04d93acc2da5fa4efb097d42484e1abb62b97c8 (diff)
* ext/json/generator/extconf.rb: remove the lines which set -O3
when -O option is not set. Note that -O3 doesn't always exist. * ext/json/parser/extconf.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/json/generator/extconf.rb10
-rw-r--r--ext/json/parser/extconf.rb10
3 files changed, 8 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 05356b918d..7df6e4116b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Dec 2 10:09:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json/generator/extconf.rb: remove the lines which set -O3
+ when -O option is not set.
+ Note that -O3 doesn't always exist.
+
+ * ext/json/parser/extconf.rb: ditto.
+
Thu Dec 2 10:01:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/extmk.rb: define $makeflags.defined? like $mflags.
diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb
index 149f22c13b..b94f71e8b3 100644
--- a/ext/json/generator/extconf.rb
+++ b/ext/json/generator/extconf.rb
@@ -1,16 +1,6 @@
require 'mkmf'
require 'rbconfig'
-unless $CFLAGS.gsub!(/ -O[\dsz]?/, ' -O3')
- $CFLAGS << ' -O3'
-end
-if CONFIG['CC'] =~ /gcc/
- $CFLAGS << ' -Wall'
- #unless $CFLAGS.gsub!(/ -O[\dsz]?/, ' -O0 -ggdb')
- # $CFLAGS << ' -O0 -ggdb'
- #end
-end
-
if RUBY_VERSION < "1.9"
have_header("re.h")
else
diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
index f61fc94660..64d1716a7a 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -1,15 +1,5 @@
require 'mkmf'
require 'rbconfig'
-unless $CFLAGS.gsub!(/ -O[\dsz]?/, ' -O3')
- $CFLAGS << ' -O3'
-end
-if CONFIG['CC'] =~ /gcc/
- $CFLAGS << ' -Wall'
- #unless $CFLAGS.gsub!(/ -O[\dsz]?/, ' -O0 -ggdb')
- # $CFLAGS << ' -O0 -ggdb'
- #end
-end
-
have_header("re.h")
create_makefile 'json/ext/parser'