--- a/tool_dependencies.xml	Sun Aug 11 06:23:16 2013 -0400
+++ b/tool_dependencies.xml	Sun Apr 20 06:25:41 2014 -0400
@@ -16,12 +16,13 @@
                 </action>
 
                 <action type="shell_command">./bootstrap.sh</action>
-                <!-- try to set the right architecture with uname -m -->
-                <action type="shell_command">if [ $(uname -m) == 'x86_64' ]; then ./bjam install --prefix=$INSTALL_DIR/boost/ -sBZIP2_INCLUDE=$BZLIB_INCLUDE_DIR -sBZIP2_LIB=$BZLIB_LIB_DIR -sBZIP2_SOURCE=$BZLIB_SOURCE_DIR; else ./bjam address-model=64 cflags=-fPIC cxxflags=-fPIC install --prefix=$INSTALL_DIR/boost/ -sBZIP2_INCLUDE=$BZLIB_INCLUDE_DIR -sBZIP2_LIB=$BZLIB_LIB_DIR -sBZIP2_SOURCE=$BZLIB_SOURCE_DIR; fi;</action>
+                <action type="shell_command">./bjam address-model=64 cflags=-fPIC cxxflags=-fPIC install --prefix=$INSTALL_DIR/boost/ -sBZIP2_INCLUDE=$BZLIB_INCLUDE_DIR -sBZIP2_LIB=$BZLIB_LIB_DIR -sBZIP2_SOURCE=$BZLIB_SOURCE_DIR</action>
 
                 <action type="set_environment">
                     <environment_variable action="set_to" name="BOOST_ROOT_DIR">$INSTALL_DIR/boost</environment_variable>
                     <environment_variable action="append_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/boost/lib/</environment_variable>
+                    <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/boost/include</environment_variable>
+                    <environment_variable action="prepend_to" name="C_INCLUDE_PATH">$INSTALL_DIR/boost/include</environment_variable>
                 </action>
             </actions>
         </install>