From a34fe9dd05fe69f36b5201ba6e6022c35324f67a Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Thu, 13 Feb 2025 22:52:55 +0200 Subject: [PATCH] extract the messages to their own shell scripts in cmd/tools/ --- GNUmakefile | 4 ++-- Makefile | 2 +- cmd/tools/cc_compilation_failed_non_windows.sh | 7 +++++++ cmd/tools/cc_compilation_failed_windows.sh | 7 +++++++ 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100755 cmd/tools/cc_compilation_failed_non_windows.sh create mode 100755 cmd/tools/cc_compilation_failed_windows.sh diff --git a/GNUmakefile b/GNUmakefile index 9699e2c1f559bb..b4651fbc88c4cf 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -98,7 +98,7 @@ endif all: latest_vc latest_tcc latest_legacy ifdef WIN32 - $(CC) $(CFLAGS) -std=c99 -municode -w -o v1.exe $(VC)/$(VCFILE) $(LDFLAGS) -lws2_32 + $(CC) $(CFLAGS) -std=c99 -municode -w -o v1.exe $(VC)/$(VCFILE) $(LDFLAGS) -lws2_32 || cmd/tools/cc_compilation_failed_windows.sh ./v1.exe -no-parallel -o v2.exe $(VFLAGS) cmd/v ./v2.exe -o $(VEXE) $(VFLAGS) cmd/v $(RM) v1.exe @@ -110,7 +110,7 @@ ifdef LEGACY rm -rf $(TMPLEGACY) $(eval override LDFLAGS+=-L$(realpath $(LEGACYLIBS))/lib -lMacportsLegacySupport) endif - $(CC) $(CFLAGS) -std=gnu99 -w -o v1.exe $(VC)/$(VCFILE) -lm -lpthread $(LDFLAGS) || echo 'Compilation of v.c failed. See https://github.com/vlang/v/wiki/Installing-a-C-compiler-on-Linux-and-macOS' && false + $(CC) $(CFLAGS) -std=gnu99 -w -o v1.exe $(VC)/$(VCFILE) -lm -lpthread $(LDFLAGS) || cmd/tools/cc_compilation_failed_non_windows.sh ./v1.exe -no-parallel -o v2.exe $(VFLAGS) cmd/v ./v2.exe -nocache -o $(VEXE) $(VFLAGS) cmd/v rm -rf v1.exe v2.exe diff --git a/Makefile b/Makefile index 02be9ce87a13c5..ac71beebe535ad 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ download_vc: if [ -f vc/v.c ] ; then git -C vc/ pull; else git clone --filter=blob:none https://github.com/vlang/vc vc/; fi v: - $(CC) $(CFLAGS) -std=gnu11 -w -o v1 vc/v.c -lm -lexecinfo -lpthread $(LDFLAGS) || echo 'See https://github.com/vlang/v/wiki/Installing-a-C-compiler-on-Linux-and-macOS' && false + $(CC) $(CFLAGS) -std=gnu11 -w -o v1 vc/v.c -lm -lexecinfo -lpthread $(LDFLAGS) || cmd/tools/cc_compilation_failed_non_windows.sh ./v1 -no-parallel -o v2 $(VFLAGS) cmd/v ./v2 -o v $(VFLAGS) cmd/v rm -rf v1 v2 diff --git a/cmd/tools/cc_compilation_failed_non_windows.sh b/cmd/tools/cc_compilation_failed_non_windows.sh new file mode 100755 index 00000000000000..33ae72571839f1 --- /dev/null +++ b/cmd/tools/cc_compilation_failed_non_windows.sh @@ -0,0 +1,7 @@ +#!/bin/sh +## this script is used by the makefiles in the top level folder +echo +echo 'Compilation of v.c failed.' +echo 'See https://github.com/vlang/v/wiki/Installing-a-C-compiler-on-Linux-and-macOS .' +echo +false diff --git a/cmd/tools/cc_compilation_failed_windows.sh b/cmd/tools/cc_compilation_failed_windows.sh new file mode 100755 index 00000000000000..8f903858734d29 --- /dev/null +++ b/cmd/tools/cc_compilation_failed_windows.sh @@ -0,0 +1,7 @@ +#!/bin/sh +## this script is used by the makefiles in the top level folder +echo +echo 'Compilation of v.c failed.' +echo 'See https://github.com/vlang/v/wiki/Installing-a-C-compiler-on-Windows .' +echo +false