From 23ec14dabe8a643f3095d9cf91eefef100a658a1 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 25 Nov 2019 20:56:27 +0000 Subject: [PATCH] bump build-common, add Makefile.inc copy for bootstrap --- bootstrap | 6 ++++++ contrib/build-common | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index e846307d8..073308c43 100755 --- a/bootstrap +++ b/bootstrap @@ -86,10 +86,16 @@ submodules() fi } +init_buildcommon_include() +{ + cp contrib/build-common/Makefile.inc contrib/Makefile.inc || true +} + main() { cleanup submodules + init_buildcommon_include check_uncrustify check_yapf check_libtool diff --git a/contrib/build-common b/contrib/build-common index 4a724617a..d6e4102ee 160000 --- a/contrib/build-common +++ b/contrib/build-common @@ -1 +1 @@ -Subproject commit 4a724617a3dd7aee4fe339c8db17ac01bd5c87a6 +Subproject commit d6e4102ee4fac9c2f06e9c92194089b728c89dff -- 2.25.1