diff options
| author | Thomas Abraham <thomas.abraham@arm.com> | 2019-03-07 20:37:02 +0530 |
|---|---|---|
| committer | Thomas Abraham <thomas.abraham@arm.com> | 2019-03-07 20:40:10 +0530 |
| commit | 27a9acfdf1373036657b30d3d427093505cd144e (patch) | |
| tree | 5b305ded25152533c1be62bb41c17a2323150a6f | |
| parent | 62fee5e0a90bb861b1a04d20e88d2276cf264f5e (diff) | |
build-grub: adapt to changes in build of grub
Commit 35b90906 ("gnulib: Upgrade Gnulib and switch to bootstrap tool")
requires the bootstrap tool to be executed before the configure step.
Change-Id: If73392da4a1605dd61c9b0dce4630829a8e17f7b
Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
| -rwxr-xr-x | build-grub.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build-grub.sh b/build-grub.sh index a4c5999..3915465 100755 --- a/build-grub.sh +++ b/build-grub.sh @@ -50,6 +50,13 @@ do_build () CROSS_COMPILE_DIR=$(dirname $CROSS_COMPILE) PATH="$PATH:$CROSS_COMPILE_DIR" mkdir -p $TOP_DIR/$GRUB_PATH/output + # On the master branch of grub, commit '35b90906' ("gnulib: Upgrade Gnulib and switch to bootstrap tool") + # required the bootstrap tool to be executed before the configure step. + if [ -e bootstrap ]; then + if [ ! -e grub-core/lib/gnulib/stdlib.in.h ]; then + ./bootstrap + fi + fi if [ ! -e config.status ]; then ./autogen.sh ./configure STRIP=$CROSS_COMPILE_DIR/aarch64-linux-gnu-strip --target=aarch64-linux-gnu --with-platform=efi --prefix=$TOP_DIR/$GRUB_PATH/output/ --disable-werror |