modifying build so that it works with solaris 2008.11

Rakefile

@@ -139,7 +139,6 @@ subdir 'ext/apache2' do
 
 	desc "Build mod_passenger Apache 2 module"
 	task :apache2 => ['mod_passenger.so', 'ApplicationPoolServerExecutable', :native_support]
-
 	file 'mod_passenger.so' => [
 		'../libboost_oxt.a',
 		'mod_passenger.o'
@@ -151,6 +150,7 @@ subdir 'ext/apache2' do
 		#
 		# Oh, and libtool sucks too. Do we even need it anymore in 2008?
 		linkflags = "#{LDFLAGS} #{MULTI_ARCH_FLAGS}"
+
 		linkflags << " -lstdc++ -lpthread " <<
 			"../libboost_oxt.a " <<
 			APR_LIBS
@@ -179,6 +179,11 @@ subdir 'ext/apache2' do
 	end
 
 	file 'mod_passenger.o' => ['mod_passenger.c'] do
+                puts "OPTIMIZATION FLAGS = #{OPTIMIZATION_FLAGS}"
+                puts "APR_FLAGS = #{APR_FLAGS}"
+                puts "APU_FLAGS = #{APU_FLAGS}"
+                puts "APXS2_FLAGS = #{APXS2_FLAGS}"
+                puts "CXXFLAGS = #{CXXFLAGS}"
 		compile_c 'mod_passenger.c', APACHE2::CXXFLAGS
 	end
 

lib/passenger/platform_info.rb

@@ -125,6 +125,7 @@ def self.determine_apxs2_flags
 			if RUBY_PLATFORM =~ /solaris/ # TODO: Add support for people using SunStudio
 				# The big problem is Coolstack apxs includes a bunch of solaris -x directives.
 				flags = flags.split.reject {|f| f =~ /^\-x/}.join(' ')
+                                flags = flags.split.reject {|f| f =~ /^\-Xa/}.join(' ')
 			end
 
 			return flags
@@ -163,6 +164,9 @@ def self.determine_apr_info
 			flags = `#{APR_CONFIG} --cppflags --includes`.strip
 			libs = `#{APR_CONFIG} --link-ld`.strip
 			flags.gsub!(/-O\d? /, '')
+                        if RUBY_PLATFORM =~ /solaris/
+                           flags = flags.split.reject {|f| f =~ /^\-mt/}.join(' ')
+                        end
 			return [flags, libs]
 		end
 	end