@@ -36,6 +36,7 @@ OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZE']) include PlatformInfo +CC = "gcc" CXX = "g++" LIBEXT = PlatformInfo.library_extension if OPTIMIZE @@ -45,11 +46,11 @@ else end # Extra compiler flags that should always be passed to the C/C++ compiler. -# Should be included last in the command string. +# Should be included last in the command string, even after PlatformInfo.portability_cflags. EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}" # Extra linker flags that should always be passed to the linker. -# Should be included last in the command string. +# Should be included last in the command string, even after PlatformInfo.portability_ldflags. EXTRA_LDFLAGS = "" Rakefile @@ -25,8 +25,10 @@ #ifndef _PASSENGER_CONFIGURATION_H_ #define _PASSENGER_CONFIGURATION_H_ -#include "Utils.h" -#include "MessageChannel.h" +#ifdef __cplusplus + #include "Utils.h" + #include "MessageChannel.h" +#endif /* The APR headers must come after the Passenger headers. See Hooks.cpp * to learn why. ext/apache2/Configuration.h @@ -23,11 +23,11 @@ # Rake functions for compiling/linking C++ stuff. -def compile_c(source, flags = CXXFLAGS) - sh "#{CXX} #{flags} -c #{source}" +def compile_c(source, flags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}") + sh "#{CC} #{flags} -c #{source}" end -def compile_cxx(source, flags = CXXFLAGS) +def compile_cxx(source, flags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}") sh "#{CXX} #{flags} -c #{source}" end @@ -43,11 +43,11 @@ def create_static_library(target, sources) sh "ranlib #{target}" end -def create_executable(target, sources, linkflags = LDFLAGS) +def create_executable(target, sources, linkflags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}") sh "#{CXX} #{sources} -o #{target} #{linkflags}" end -def create_shared_library(target, sources, flags = LDFLAGS) +def create_shared_library(target, sources, flags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}") if RUBY_PLATFORM =~ /darwin/ shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup" else misc/rake/cplusplus.rb ff1cfdc7d5138e42fe7d9f00e2393cf6cf42ee40 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/0135af9de03802caef6d35e0ff4a5e199425e4aa 0135af9de03802caef6d35e0ff4a5e199425e4aa 2009-05-28T13:02:23-07:00 2009-05-28T13:02:23-07:00 Fix some build system problems. c1ad00cc7a676d960009396ae2dd12f6574eb796 Hongli Lai (Phusion) hongli@phusion.nl