apache2.rb in passenger-5.0.5

- old
+ new

@@ -1,7 +1,7 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -63,13 +63,14 @@
 APACHE2_MODULE_CXXFLAGS =
   "#{EXTRA_PRE_CXXFLAGS} " <<
   "-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)
+APACHE2_MODULE_BOOST_OXT_LIBRARY, APACHE2_MODULE_BOOST_OXT_LINKARG =
+  define_libboost_oxt_task("apache2",
+    APACHE2_OUTPUT_DIR + "module_libboost_oxt",
+    PlatformInfo.apache2_module_cflags)
 APACHE2_MODULE_COMMON_LIBRARIES  = COMMON_LIBRARY.
   only(:base, 'ApplicationPool2/AppTypes.o',
     'Utils/MD5.o', 'Utils/modp_b64.o').
   set_namespace("apache2").
   set_output_dir(APACHE2_OUTPUT_DIR + "module_libpassenger_common").
@@ -124,10 +125,10 @@
 
   sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
   linkflags =
     "#{EXTRA_PRE_CXX_LDFLAGS} " <<
     "#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
-    "#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
+    "#{APACHE2_MODULE_BOOST_OXT_LINKARG} " <<
     "#{PlatformInfo.apache2_module_cxx_ldflags} " <<
     "#{PlatformInfo.portability_cxx_ldflags} " <<
     "#{EXTRA_CXX_LDFLAGS} "
 
   create_shared_library(APACHE2_MODULE, sources, linkflags)