Merge branch 'osx_build_fixes' of github.com:STEllAR-GROUP/hpx into osx_build_fixes

Author: khuck

hpx/hpx_init_impl.hpp

@@ -76,9 +76,7 @@ namespace hpx
 #endif
         // set a handler for std::abort
         std::signal(SIGABRT, detail::on_abort);
-#if !defined (__APPLE__)
         std::at_quick_exit(detail::on_exit);
-#endif
         std::atexit(detail::on_exit);
 
         return detail::run_or_start(f, desc_cmdline, argc, argv,

hpx/hpx_start_impl.hpp

@@ -77,9 +77,7 @@ namespace hpx
 #endif
         // set a handler for std::abort, std::at_quick_exit, and std::atexit
         std::signal(SIGABRT, detail::on_abort);
-#if !defined (__APPLE__)
         std::at_quick_exit(detail::on_exit);
-#endif
         std::atexit(detail::on_exit);
 
         return 0 == detail::run_or_start(f, desc_cmdline, argc, argv,

src/CMakeLists.txt

@@ -330,7 +330,7 @@ foreach(_module ${HPX_LIBS})
     # forced into libhpx with this option)
     if(APPLE)
       set(_module_target "-Wl,-all_load" "${_module_target}")
-    else(APPLE)
+    else(APPLE) # not apple, regular linux
       set(_module_target "-Wl,--whole-archive" "${_module_target}" "-Wl,--no-whole-archive")
     endif(APPLE)
   endif(UNIX)