include the ICU header without checking OS version

MacRuby · Mar 5, 2012 · 6868a67 · 6868a67
1 parent e32766b
commit 6868a67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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'
-      @cflags << ' -I./icu-1060'
+    @cxxflags << ' -I./icu-1060'
-      @cxxflags << ' -I./icu-1060'
-    end
     if sdk
       sdk_flags = "--sysroot=#{sdk}"
       @cflags << " #{sdk_flags}"