diff --git a/boost/android-armv7a-eabi/PKGBUILD b/boost/android-armv7a-eabi/PKGBUILD
index 3209dd65..6bda9d51 100644
--- a/boost/android-armv7a-eabi/PKGBUILD
+++ b/boost/android-armv7a-eabi/PKGBUILD
@@ -18,7 +18,7 @@ _boost_address_model=32
 pkgname=android-$_pkg_arch-$_pkgname
 pkgver=1.75.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 url='https://www.boost.org/'
 arch=('any')
 license=('custom')
@@ -42,14 +42,10 @@ build() {
   local _stagedir="${srcdir}/stagedir"
   local jobs="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
   local target_flags=" \
-    --target=$_android_target \
-    --gcc-toolchain=$_android_ndk_path/toolchains/$_andoird_toolchain_dir-4.9/prebuilt/linux-x86_64 \
-    --sysroot=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr"
+    --target=$_android_target"
   local common_flags=" \
     $target_flags \
-    -isystem $_android_ndk_path/sources/android/support/include \
-    -isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++/include \
-    -isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++abi/include \
+    -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1 \
     -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include \
     -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/$_android_toolchain \
     -fexceptions \
@@ -62,8 +58,6 @@ build() {
     $target_flags \
     -fexceptions \
     $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
-    -B$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$_android_toolchain/$_android_platform \
-    -L$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$_android_toolchain/$_android_platform \
     -nostdlib++"
 
   cd ${_pkgname}_${_boostver}
diff --git a/boost/android-x86-64/PKGBUILD b/boost/android-x86-64/PKGBUILD
index 87534d71..a3e195e2 100644
--- a/boost/android-x86-64/PKGBUILD
+++ b/boost/android-x86-64/PKGBUILD
@@ -18,7 +18,7 @@ _boost_address_model=64
 pkgname=android-$_pkg_arch-$_pkgname
 pkgver=1.75.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 url='https://www.boost.org/'
 arch=('any')
 license=('custom')
@@ -42,14 +42,10 @@ build() {
   local _stagedir="${srcdir}/stagedir"
   local jobs="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
   local target_flags=" \
-    --target=$_android_target \
-    --gcc-toolchain=$_android_ndk_path/toolchains/$_andoird_toolchain_dir-4.9/prebuilt/linux-x86_64 \
-    --sysroot=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr"
+    --target=$_android_target"
   local common_flags=" \
     $target_flags \
-    -isystem $_android_ndk_path/sources/android/support/include \
-    -isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++/include \
-    -isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++abi/include \
+    -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1 \
     -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include \
     -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/$_android_toolchain \
     -fexceptions \
@@ -62,7 +58,6 @@ build() {
     $target_flags \
     -fexceptions \
     $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
-    -B$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$_android_toolchain/$_android_platform \
     -nostdlib++"
 
   cd ${_pkgname}_${_boostver}
diff --git a/boost/android-x86/PKGBUILD b/boost/android-x86/PKGBUILD
index 3002d08f..d3ba6cc7 100644
--- a/boost/android-x86/PKGBUILD
+++ b/boost/android-x86/PKGBUILD
@@ -18,7 +18,7 @@ _boost_address_model=32
 pkgname=android-$_pkg_arch-$_pkgname
 pkgver=1.75.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 url='https://www.boost.org/'
 arch=('any')
 license=('custom')
@@ -42,14 +42,10 @@ build() {
   local _stagedir="${srcdir}/stagedir"
   local jobs="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
   local target_flags=" \
-    --target=$_android_target \
-    --gcc-toolchain=$_android_ndk_path/toolchains/$_andoird_toolchain_dir-4.9/prebuilt/linux-x86_64 \
-    --sysroot=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr"
+    --target=$_android_target"
   local common_flags=" \
     $target_flags \
-    -isystem $_android_ndk_path/sources/android/support/include \
-    -isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++/include \
-    -isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++abi/include \
+    -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1 \
     -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include \
     -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/$_android_toolchain \
     -fexceptions \
@@ -62,7 +58,6 @@ build() {
     $target_flags \
     -fexceptions \
     $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
-    -B$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$_android_toolchain/$_android_platform \
     -nostdlib++"
 
   cd ${_pkgname}_${_boostver}