[macruby-changes] [3578] MacRuby/branches/icu/rakelib/builder/options.rb

[source_changes at macosforge.org]

Revision: 3578
          http://trac.macosforge.org/projects/ruby/changeset/3578
Author:   lsansonetti at apple.com
Date:     2010-02-19 02:15:25 -0800 (Fri, 19 Feb 2010)
Log Message:
-----------
pass -I./icu-1060 to CXXFLAGS too

Modified Paths:
--------------
    MacRuby/branches/icu/rakelib/builder/options.rb

Modified: MacRuby/branches/icu/rakelib/builder/options.rb
===================================================================
--- MacRuby/branches/icu/rakelib/builder/options.rb	2010-02-19 06:17:08 UTC (rev 3577)
+++ MacRuby/branches/icu/rakelib/builder/options.rb	2010-02-19 10:15:25 UTC (rev 3578)
@@ -103,16 +103,6 @@
 CXX = '/usr/bin/g++-4.2'
 CFLAGS = "-I. -I./include -I./onig -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions"
 CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD
-if `sw_vers -productVersion`.to_f <= 10.6
-  CFLAGS << " -I./icu-1060"
-else
-  if File.exist?('/usr/local/include/unicode')
-    CFLAGS << " -I/usr/local/include"
-  else
-    $stderr.puts "Cannot locate ICU headers for this version of Mac OS X."
-    exit 1
-  end
-end
 OBJC_CFLAGS = CFLAGS + " -fobjc-gc-only"
 CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').strip
 CXXFLAGS << " -I. -I./include -g -Wall #{ARCHFLAGS}"
@@ -125,6 +115,16 @@
 CFLAGS << " -std=c99" # we add this one later to not conflict with C++ flags
 OBJC_CFLAGS << " -std=c99"
 
+if `sw_vers -productVersion`.to_f <= 10.6
+  CFLAGS << " -I./icu-1060"
+  CXXFLAGS << " -I./icu-1060"
+else
+  if !File.exist?('/usr/local/include/unicode')
+    $stderr.puts "Cannot locate ICU headers for this version of Mac OS X."
+    exit 1
+  end
+end
+
 OBJS_CFLAGS = {
   # Make sure everything gets inlined properly + compile as Objective-C++.
   'dispatcher' => '--param inline-unit-growth=10000 --param large-function-growth=10000 -x objective-c++',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100219/f14f7d65/attachment.html>