--- GNUmakefile.original 2022-11-15 12:19:06.000000000 +0000 +++ GNUmakefile 2022-11-15 12:21:08.000000000 +0000 @@ -7,12 +7,9 @@ VEXE ?= ./v VCREPO ?= https://github.com/vlang/vc TCCREPO ?= https://github.com/vlang/tccbin -LEGACYREPO ?= https://github.com/macports/macports-legacy-support VCFILE := v.c TMPTCC := $(VROOT)/thirdparty/tcc -LEGACYLIBS := $(VROOT)/thirdparty/legacy -TMPLEGACY := $(LEGACYLIBS)/source TCCOS := unknown TCCARCH := unknown GITCLEANPULL := git clean -xf && git pull --quiet @@ -39,9 +36,6 @@ ifeq ($(_SYS),Darwin) MAC := 1 TCCOS := macos -ifeq ($(shell expr $(shell uname -r | cut -d. -f1) \<= 15), 1) -LEGACY := 1 -endif endif ifeq ($(_SYS),FreeBSD) @@ -85,13 +79,13 @@ endif endif -.PHONY: all clean rebuild check fresh_vc fresh_tcc fresh_legacy check_for_working_tcc +.PHONY: all clean rebuild check fresh_vc fresh_tcc check_for_working_tcc ifdef prod VFLAGS+=-prod endif -all: latest_vc latest_tcc latest_legacy +all: latest_vc latest_tcc ifdef WIN32 $(CC) $(CFLAGS) -std=c99 -municode -w -o v1.exe $(VC)/$(VCFILE) $(LDFLAGS) v1.exe -no-parallel -o v2.exe $(VFLAGS) cmd/v @@ -99,12 +93,6 @@ del v1.exe del v2.exe else -ifdef LEGACY - $(MAKE) -C $(TMPLEGACY) - $(MAKE) -C $(TMPLEGACY) PREFIX=$(realpath $(LEGACYLIBS)) CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) install - 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) ./v1.exe -no-parallel -o v2.exe $(VFLAGS) cmd/v ./v2.exe -o $(VEXE) $(VFLAGS) cmd/v @@ -163,33 +151,12 @@ @$(MAKE) --quiet check_for_working_tcc 2> /dev/null endif -ifndef local -latest_legacy: $(TMPLEGACY)/.git/config -ifdef LEGACY - cd $(TMPLEGACY) && $(GITCLEANPULL) -endif -else -latest_legacy: -ifdef LEGACY - @echo "Using local legacysupport" -endif -endif - -fresh_legacy: - rm -rf $(LEGACYLIBS) - $(GITFASTCLONE) $(LEGACYREPO) $(TMPLEGACY) - $(TMPTCC)/.git/config: $(MAKE) fresh_tcc $(VC)/.git/config: $(MAKE) fresh_vc -$(TMPLEGACY)/.git/config: -ifdef LEGACY - $(MAKE) fresh_legacy -endif - asan: $(MAKE) all CFLAGS='-fsanitize=address,undefined'