Permalink
Browse files

include the ICU header without checking OS version

  • Loading branch information...
1 parent e32766b commit 6868a67f07c9fca4bbf7d332676c01ad8cc75559 @Watson1978 Watson1978 committed Mar 5, 2012
Showing with 4 additions and 6 deletions.
  1. +1 −1 ext/iconv/extconf.rb
  2. +1 −1 ext/ripper/extconf.rb
  3. +2 −4 rakelib/builder/options.rb
View
@@ -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|
View
@@ -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
@@ -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}"

0 comments on commit 6868a67

Please sign in to comment.