build/apache2.rb in passenger-4.0.48 vs build/apache2.rb in passenger-4.0.49

@@ -61,11 +61,11 @@
 	"#{EXTRA_PRE_CFLAGS} " <<
 	"-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
 	"#{EXTRA_CFLAGS}"
 APACHE2_MODULE_CXXFLAGS =
 	"#{EXTRA_PRE_CXXFLAGS} " <<
-	"-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
+	"-Iext -Iext/common #{PlatformInfo.apache2_module_cxxflags} " <<
 	"#{EXTRA_CXXFLAGS}"
 
 APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
 	APACHE2_OUTPUT_DIR + "module_libboost_oxt",
 	PlatformInfo.apache2_module_cflags)
@@ -124,19 +124,19 @@
 ].flatten
 file APACHE2_MODULE => dependencies do
 	PlatformInfo.apxs2.nil?      and raise "Could not find 'apxs' or 'apxs2'."
 	PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
 	PlatformInfo.httpd.nil?      and raise "Could not find the Apache web server binary."
-	
+
 	sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
 	linkflags =
 		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
 		"#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
 		"#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
-		"#{PlatformInfo.apache2_module_ldflags} " <<
+		"#{PlatformInfo.apache2_module_cxx_ldflags} " <<
 		"#{PlatformInfo.portability_cxx_ldflags} " <<
 		"#{EXTRA_CXX_LDFLAGS} "
-	
+
 	create_shared_library(APACHE2_MODULE, sources, linkflags)
 end
 
 file APACHE2_MOD_PASSENGER_O => ['ext/apache2/mod_passenger.c'] do
 	compile_c('ext/apache2/mod_passenger.c',