patch

Author: CryptoLover705

depends/packages/boost.mk

@@ -7,6 +7,11 @@ $(package)_sha256_hash=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff02
 # Optional patch
 $(package)_patches += bootstrap-clang-darwin.patch
 
+ifeq ($(host_os),darwin)
+$(package)_patches += use-libcxx-v1.patch
+endif
+
+
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
 $(package)_config_opts_debug=variant=debug
@@ -25,7 +30,7 @@ $(package)_config_opts_i686_linux=address-model=32 architecture=x86
 $(package)_toolset_$(host_os)=gcc
 $(package)_archiver_$(host_os)=$($(package)_ar)
 
-# darwin override
+# Darwin override
 $(package)_toolset_darwin=clang
 $(package)_archiver_darwin=$($(package)_ar)
 
@@ -38,8 +43,7 @@ $(package)_config_libraries=chrono,filesystem,program_options,system,thread
 $(package)_cxxflags=-std=c++11 -fvisibility=hidden
 $(package)_cxxflags_linux=-fPIC
 
-$(package)_cppflags+= --sysroot=$(OSX_SDK_PATH)
-$(package)_cflags+= --sysroot=$(OSX_SDK_PATH)
+# sysroot is passed by toolchain, NOT duplicated here
 $(package)_ldflags+= -Wl,-syslibroot,$(OSX_SDK_PATH)
 endef
 
@@ -51,7 +55,7 @@ ifeq ($(host_os),darwin)
 
 define $(package)_preprocess_cmds
   echo "using clang : : clang++ -target x86_64-apple-darwin11 --sysroot=$(OSX_SDK_PATH) -stdlib=libc++ -mmacosx-version-min=10.8 \
-    : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags) -stdlib=libc++ -isystem$(OSX_SDK_PATH)/usr/include/c++/v1\" \
+    : <cxxflags>\"$($(package)_cxxflags) -stdlib=libc++ -isystem$(OSX_SDK_PATH)/usr/include/c++/v1\" \
       <linkflags>\"$($(package)_ldflags) -stdlib=libc++\" \
       <archiver>\"$(host_AR)\" \
       <ranlib>\"$(host_RANLIB)\" \
@@ -63,7 +67,7 @@ else
 
 define $(package)_preprocess_cmds
   echo "using gcc : : $($(package)_cxx) \
-    : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" \
+    : <cxxflags>\"$($(package)_cxxflags)\" \
       <linkflags>\"$($(package)_ldflags)\" \
       <archiver>\"$($(package)_ar)\" \
       <ranlib>\"$(host_RANLIB)\" \

depends/patches/boost/use-libcxx-v1.patch

@@ -0,0 +1,9 @@
+--- a/tools/build/src/tools/clang-darwin.jam
++++ b/tools/build/src/tools/clang-darwin.jam
+@@ -150,7 +150,7 @@ rule init ( version ? : command * : options * )
+     # Standard include paths
+-    flags compile.c++ OPTIONS <cxxflags>"-isystem$(macosx.sdkroot)/usr/include/c++/4.2.1" ;
++    flags compile.c++ OPTIONS <cxxflags>"-isystem$(macosx.sdkroot)/usr/include/c++/v1" ;
+
+     # Force libc++
+     flags compile.c++ OPTIONS <cxxflags>"-stdlib=libc++" ;