1 files changed, 15 insertions, 0 deletions
diff --git a/chapter6/bash.sh b/chapter6/bash.sh
index 7d080f2..54c10a7 100644
--- a/chapter6/bash.sh
+++ b/chapter6/bash.sh
@@ -1,3 +1,17 @@
+<<<<<<< HEAD
+#!/bin/bash
+set -e
+
+patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch &&
+./configure --prefix=/usr \
+            --build="$(support/config.guess)" \
+            --host="${LFS_TGT}" \
+            --without-bash-malloc &&
+make &&
+make DESTDIR="${LFS}" -j1 install &&
+mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash &&
+ln -sv bash "${LFS}"/bin/sh
+=======
 #!/bin/bash
 set -e
 
@@ -10,3 +24,4 @@ make &&
 make DESTDIR="${LFS}" -j1 install &&
 mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash &&
 ln -sv bash "${LFS}"/bin/sh
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28