From 7346d635b3292d516a2aeb283c9a4864cec7cafb Mon Sep 17 00:00:00 2001 From: Roman Bolshakov Date: Wed, 7 Nov 2018 01:37:38 +0300 Subject: [PATCH 1/2] Provide more overrides for make glibc's configure script looks for make in the following order: gnumake gmake make but crosstool-ng has an override only for make. So glibc picks up gnumake from system and fails to proceed with the build because system make is very old. It'd more reliable if we also override gnumake and gmake. Signed-off-by: Roman Bolshakov --- paths.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/paths.sh.in b/paths.sh.in index ad42916d..a9a5ee80 100644 --- a/paths.sh.in +++ b/paths.sh.in @@ -2,6 +2,8 @@ export install="@INSTALL@" export bash="@BASH_SHELL@" export awk="@AWK@" export grep="@GREP@" +export gmake="@MAKE@" +export gnumake="@MAKE@" export make="@MAKE@" export sed="@SED@" export libtool="@LIBTOOL@" From 0229bc415ea9f2fe7c4a89178d955e57d729d7ba Mon Sep 17 00:00:00 2001 From: Roman Bolshakov Date: Wed, 7 Nov 2018 20:39:11 +0300 Subject: [PATCH 2/2] Add an override for bison glibc build requires GNU bison >= 2.7 but Apple ships bison 2.3. If we provide an override for GNU bison it should be possible to use a version from homebrew. Signed-off-by: Roman Bolshakov --- configure.ac | 2 +- paths.sh.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 19eb5212..27d96b95 100644 --- a/configure.ac +++ b/configure.ac @@ -113,8 +113,8 @@ AC_PROG_RANLIB CTNG_PATH_TOOL_REQ([OBJCOPY], [gobjcopy objcopy], [objcopy]) CTNG_PATH_TOOL_REQ([OBJDUMP], [gobjdump objdump], [objdump]) CTNG_PATH_TOOL_REQ([READELF], [greadelf readelf], [readelf]) +CTNG_PATH_TOOL_REQ([BISON], [bison], [bison]) -CTNG_CHECK_PROGS_REQ([bison], [bison]) CTNG_CHECK_PROGS_REQ([flex], [flex]) CTNG_CHECK_PROGS_REQ([makeinfo], [makeinfo]) CTNG_CHECK_PROGS_REQ([cut], [cut]) diff --git a/paths.sh.in b/paths.sh.in index a9a5ee80..7b57a8a4 100644 --- a/paths.sh.in +++ b/paths.sh.in @@ -1,5 +1,6 @@ export install="@INSTALL@" export bash="@BASH_SHELL@" +export bison="@BISON@" export awk="@AWK@" export grep="@GREP@" export gmake="@MAKE@"