@@ -157,11 +157,21 @@ BASIC_FLAGS = %W[ -pipe -Wall -Wno-deprecated FLAGS = BASIC_FLAGS.dup +# Check compiler preferences (LLVM may still override.) +CC = ENV['CC'] || "gcc" +CXX = ENV["CXX"] || "g++" + if RUBY_PLATFORM =~ /darwin/i if `sw_vers` =~ /10\.4/ FLAGS.concat %w(-DHAVE_STRLCAT -DHAVE_STRLCPY) end - FLAGS << "-mdynamic-no-pic" + + # This flag makes the executable non-relocatable (and + # slightly faster), but 4.3 does not support it. + # TODO: Look for workarounds. + unless `#{CC} -v 2>&1` =~ /gcc version 4\.3/i + FLAGS << "-mdynamic-no-pic" + end end if LLVM_ENABLE @@ -182,10 +192,6 @@ if ENV['DEV'] BUILD_PRETASKS << "build:debug_flags" end -# Check compiler preferences (LLVM may still override.) -CC = ENV['CC'] || "gcc" -CXX = ENV["CXX"] || "g++" - def compile_c(obj, src, output_kind="c") flags = INCLUDES + FLAGS + llvm_flags rakelib/vm.rake 31e896398f38766b0dd1e80b1c35d6ff7d1573fa Eero Saynatkari esaynatkari@attinteractive.com http://github.com/evanphx/rubinius/commit/799bf3c603a4534a9ba19561f4a1c2d4fd93829b 799bf3c603a4534a9ba19561f4a1c2d4fd93829b 2009-10-06T18:19:20-07:00 2009-10-06T18:08:20-07:00 Work around compilation issue on OS X 10.5 GCC 4.3. f4ff37c562be58c86debf8f3953d0bfcf1b33a22 Eero Saynatkari esaynatkari@attinteractive.com