From 6868a67f07c9fca4bbf7d332676c01ad8cc75559 Mon Sep 17 00:00:00 2001 From: Watson Date: Mon, 5 Mar 2012 21:12:00 +0900 Subject: [PATCH] include the ICU header without checking OS version --- ext/iconv/extconf.rb | 2 +- ext/ripper/extconf.rb | 2 +- rakelib/builder/options.rb | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb index 6f454be4b..dbe32fe2c 100644 --- a/ext/iconv/extconf.rb +++ b/ext/iconv/extconf.rb @@ -43,7 +43,7 @@ $cleanfiles << wrapper end $INCFLAGS << ' -I../..' - $INCFLAGS << ' -I../../icu-1060' if `sw_vers -productVersion`.to_f <= 10.7 + $INCFLAGS << ' -I../../icu-1060' create_makefile("iconv") if conf open("Makefile", "a") do |mf| diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb index 4c0ed9be0..f8166651c 100644 --- a/ext/ripper/extconf.rb +++ b/ext/ripper/extconf.rb @@ -16,7 +16,7 @@ def main $defs << '-DRIPPER_DEBUG' if $debug $VPATH << '$(topdir)' << '$(top_srcdir)' $INCFLAGS << ' -I$(topdir) -I$(top_srcdir) -I$(top_srcdir)/onig' - $INCFLAGS << ' -I../../icu-1060' if `sw_vers -productVersion`.to_f <= 10.7 + $INCFLAGS << ' -I../../icu-1060' $CFLAGS << ' -std=c99' create_makefile 'ripper' end diff --git a/rakelib/builder/options.rb b/rakelib/builder/options.rb index 4eca38b83..a59608a8b 100644 --- a/rakelib/builder/options.rb +++ b/rakelib/builder/options.rb @@ -180,10 +180,8 @@ def initialize(opt) end @cxxflags << " -fno-rtti" unless @cxxflags.index("-fno-rtti") @dldflags = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION} -exported_symbols_list #{EXPORTED_SYMBOLS_LIST}" - if `sw_vers -productVersion`.to_f <= 10.7 - @cflags << ' -I./icu-1060' - @cxxflags << ' -I./icu-1060' - end + @cflags << ' -I./icu-1060' + @cxxflags << ' -I./icu-1060' if sdk sdk_flags = "--sysroot=#{sdk}" @cflags << " #{sdk_flags}"