cross_tools: allow specifying a custom sysroot path

* Use with --sysroot /path/to/sysroot; useful for CI environments and cross-building. Change-Id: I27a93a5d209cd5324591587e85fce9b47c18172d Reviewed-on: https://review.haiku-os.org/c/haiku/+/5318 Tested-by: Commit checker robot <[email protected]> Reviewed-by: Adrien Destugues <[email protected]>
2022-06-05 09:08:20 +00:00
parent 8a30322767
commit e9e00b80c0
2 changed files with 15 additions and 2 deletions
@@ -161,7 +161,7 @@ binutilsObjDir="$objDir/binutils"
 gccObjDir="$objDir/gcc"
 gdbObjDir="$objDir/gdb"
 stdcxxObjDir="$objDir/stdcxx"
-sysrootDir="$installDir/sysroot"
+sysrootDir=${HAIKU_USE_SYSROOT:-"$installDir/sysroot"}
 tmpIncludeDir="$sysrootDir/boot/system/develop/headers"
 tmpLibDir="$sysrootDir/boot/system/develop/lib"

@@ -279,7 +279,11 @@ mv "$installDir/$haikuMachine/lib/libstdc++.a" \
 	"$installDir/$haikuMachine/lib/libstdc++-static.a"

 # remove the sysroot dir
-rm -rf "$sysrootDir"
+if [ -n "$HAIKU_USE_SYSROOT" ]; then
+	rm -rf "$sysrootDir"/boot/system/*
+else
+	rm -rf "$sysrootDir"
+fi

 # remove the objects dir
 rm -rf "$objDir"