From: Sven Roederer Date: Sun, 27 Sep 2020 21:07:38 +0000 (+0200) Subject: build, imagebuilder: Do not require compilers X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=79b1fa170288115d1929c55713dc840a133bddd9;p=openwrt%2Fstaging%2Fxback.git build, imagebuilder: Do not require compilers The buildroot and SDK both require the compilers (gcc, g++) to be installed on the host system, however the ImageBuilder uses precompiled binaries. This patch changes the prerequirements checks to skip the checking for the compilers if running as ImageBuilder. A similar change has been made for libncurses-dev in 4a1a58a3e2d2. Signed-off-by: Sven Roederer Acked-by: Paul Spooren (cherry picked from commit ae12a747cae3df16d84b7dc92f39427948d4e8e2) --- diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 622db96ee3..7504d43a74 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -26,6 +26,7 @@ $(eval $(call TestHostCommand,proper-umask, \ Please build with umask 022 - other values produce broken packages, \ umask | grep -xE 0?0[012][012])) +ifndef IB $(eval $(call SetupHostCommand,gcc, \ Please install the GNU C Compiler (gcc) 4.8 or later, \ $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ @@ -37,7 +38,9 @@ $(eval $(call TestHostCommand,working-gcc, \ it appears to be broken, \ echo 'int main(int argc, char **argv) { return 0; }' | \ gcc -x c -o $(TMP_DIR)/a.out -)) +endif +ifndef IB $(eval $(call SetupHostCommand,g++, \ Please install the GNU C++ Compiler (g++) 4.8 or later, \ $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ @@ -50,6 +53,7 @@ $(eval $(call TestHostCommand,working-g++, \ echo 'int main(int argc, char **argv) { return 0; }' | \ g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ $(TMP_DIR)/a.out)) +endif ifndef IB $(eval $(call TestHostCommand,ncurses, \