From 23f8c2bbe6794fede1a049499b5f7d0fed3d43cc Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Thu, 18 Jun 2020 14:06:23 -0400
Subject: [PATCH] waterbox:  move location of llvm-project

---
 waterbox/libcxx/configure-for-waterbox-phase-- | 4 ++--
 waterbox/libcxx/configure-for-waterbox-phase-0 | 4 ++--
 waterbox/libcxx/configure-for-waterbox-phase-1 | 4 ++--
 waterbox/libcxx/configure-for-waterbox-phase-2 | 4 ++--
 waterbox/libcxx/readme.txt                     | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/waterbox/libcxx/configure-for-waterbox-phase-- b/waterbox/libcxx/configure-for-waterbox-phase--
index 275bd0bb72..d9217d2169 100644
--- a/waterbox/libcxx/configure-for-waterbox-phase--
+++ b/waterbox/libcxx/configure-for-waterbox-phase--
@@ -1,7 +1,7 @@
 #!/bin/sh
 MYPATH="`dirname \"$0\"`"
 SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../../../llvm-project\"`"
+LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
 
 #To uselibclang-rt (and libunwind), we need to evict the gcc libs, but musl automatically puts that in the specs file
 #and has no setting to remove it.  Fix that here.
@@ -27,4 +27,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../../../llvm-project/compiler-rt
+	../../llvm-project/compiler-rt
diff --git a/waterbox/libcxx/configure-for-waterbox-phase-0 b/waterbox/libcxx/configure-for-waterbox-phase-0
index 9017221820..12b23ea1e9 100644
--- a/waterbox/libcxx/configure-for-waterbox-phase-0
+++ b/waterbox/libcxx/configure-for-waterbox-phase-0
@@ -1,7 +1,7 @@
 #!/bin/sh
 MYPATH="`dirname \"$0\"`"
 SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../../../llvm-project\"`"
+LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
 rm -rf build0
 mkdir build0
 cd build0
@@ -16,4 +16,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../../../llvm-project/libunwind
+	../../llvm-project/libunwind
diff --git a/waterbox/libcxx/configure-for-waterbox-phase-1 b/waterbox/libcxx/configure-for-waterbox-phase-1
index ce9f6af6f4..16f903abef 100644
--- a/waterbox/libcxx/configure-for-waterbox-phase-1
+++ b/waterbox/libcxx/configure-for-waterbox-phase-1
@@ -1,7 +1,7 @@
 #!/bin/sh
 MYPATH="`dirname \"$0\"`"
 SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../../../llvm-project\"`"
+LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
 rm -rf build1
 mkdir build1
 cd build1
@@ -24,4 +24,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../../../llvm-project/libcxxabi
+	../../llvm-project/libcxxabi
diff --git a/waterbox/libcxx/configure-for-waterbox-phase-2 b/waterbox/libcxx/configure-for-waterbox-phase-2
index 7bfd381230..5fafb9d626 100644
--- a/waterbox/libcxx/configure-for-waterbox-phase-2
+++ b/waterbox/libcxx/configure-for-waterbox-phase-2
@@ -1,7 +1,7 @@
 #!/bin/sh
 MYPATH="`dirname \"$0\"`"
 SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../../../llvm-project\"`"
+LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
 
 #libcxx needs this one trivial file to autodetect sendfile(2), which musl does support
 mkdir -p "$SYSROOT/include/linux"
@@ -31,4 +31,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../../../llvm-project/libcxx
+	../../llvm-project/libcxx
diff --git a/waterbox/libcxx/readme.txt b/waterbox/libcxx/readme.txt
index 74feb7a2d9..133b4a8184 100644
--- a/waterbox/libcxx/readme.txt
+++ b/waterbox/libcxx/readme.txt
@@ -1,6 +1,6 @@
 Building and installing libcxx:
 
-1. Clone llvm-project into $BIZHAWKGITROOT/../llvm-project
+1. Clone llvm-project into $BIZHAWKGITROOT/waterbox/llvm-project
 	* I used eaae6dfc545000e335e6f89abb9c78818383d7ad, which was the tip of origin/release/10.x at the time
 2. Come to this folder
 3. Run ./do-everything.sh