summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-01-21 14:16:38 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-01-21 14:16:38 +0000
commit26ad0b129e2897c5ef105fd9d98897afeba452f0 (patch)
tree43dd495d7e14a0e6444134f9c4d0b453048473f0
parent5534c6e5952bf1b2cbd0f85890e9dcd66139683b (diff)
downloadlh-bootstrap-26ad0b129e2897c5ef105fd9d98897afeba452f0.tar.xz
Small incremental build fixes (14)
-rwxr-xr-xmake8
-rw-r--r--sub/kernel/Makefile.ncurses2
2 files changed, 2 insertions, 8 deletions
diff --git a/make b/make
index 94f7d5e..f69d033 100755
--- a/make
+++ b/make
@@ -16,13 +16,7 @@ fi
WD=$(pwd)
-if test -z "$BUILD_BUILD_CC" ; then
- if test -n "${BUILD_TRIPLE}${BUILD_BASE}" ; then
- BUILD_BUILD_CC="${BUILD_BASE}/${BUILD_TRIPLE}-gcc"
- else
- BUILD_BUILD_CC=${BUILD_BUILD_CC:-gcc}
- fi
-fi
+BUILD_BUILD_CC=${BUILD_BUILD_CC:-gcc}
OUTPUT=${OUTPUT:-$WD/output}
BUILD_HOST_CC="$TRIPLE-${CROSS_CC:-gcc}"
diff --git a/sub/kernel/Makefile.ncurses b/sub/kernel/Makefile.ncurses
index 248071c..6627a98 100644
--- a/sub/kernel/Makefile.ncurses
+++ b/sub/kernel/Makefile.ncurses
@@ -5,7 +5,7 @@ NCURSES_URLDIR := https://invisible-mirror.net/archives/$(NCURSES_NAME)/current
NCURSES_TAREXT := tgz
NCURSES_TARLETTER := z
-NCURSES_CONFIGURE_OPTIONS := --without-ada --without-cxx-binding --without-manpages --without-progs --without-tack --without-tests --without-curses-h --disable-pc-files --without-shared --without-debug --without-profile --enable-rpath --disable-home-terminfo --enable-widec --with-pthread --enable-weak-symbols --without-develop --enable-reentrant --enable-symlinks
+NCURSES_CONFIGURE_OPTIONS := --without-ada --without-cxx-binding --without-manpages --without-tack --without-tests --without-curses-h --disable-pc-files --without-shared --without-debug --without-profile --enable-rpath --disable-home-terminfo --enable-widec --with-pthread --enable-weak-symbols --without-develop --enable-reentrant --enable-symlinks
NCURSES_CFLAGS := ""
NCURSES_LDFLAGS := ""