makefiles: rename as requested in issues tracker (#11380)

pull/11400/head
Paul Dardeau 2021-09-04 06:32:42 -05:00 committed by GitHub
parent 4503ff337b
commit 0115a51de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 161 additions and 160 deletions

View File

@ -20,5 +20,5 @@ trim_trailing_whitespace = false
[*.{txt,out}] [*.{txt,out}]
insert_final_newline = false insert_final_newline = false
[Makefile] [{Makefile,GNUmakefile}]
indent_style = tab indent_style = tab

1
.gitignore vendored
View File

@ -49,6 +49,7 @@ fns.txt
!Dockerfile.cross !Dockerfile.cross
!LICENSE !LICENSE
!Makefile !Makefile
!GNUmakefile
# ignore editor files # ignore editor files
.idea .idea

View File

@ -1,8 +0,0 @@
CC ?= cc
all:
rm -rf vc/
git clone --depth 1 --quiet https://github.com/vlang/vc
$(CC) -std=gnu11 -w -o v vc/v.c -lm -lexecinfo
rm -rf vc/
@echo "V has been successfully built"

154
GNUmakefile 100644
View File

@ -0,0 +1,154 @@
CC ?= cc
CFLAGS ?=
LDFLAGS ?=
TMPDIR ?= /tmp
VROOT ?= .
VC ?= ./vc
V ?= ./v
VCREPO ?= https://github.com/vlang/vc
TCCREPO ?= https://github.com/vlang/tccbin
VCFILE := v.c
TMPTCC := $(VROOT)/thirdparty/tcc
TCCOS := unknown
TCCARCH := unknown
GITCLEANPULL := git clean -xf && git pull --quiet
GITFASTCLONE := git clone --depth 1 --quiet --single-branch
#### Platform detections and overrides:
_SYS := $(shell uname 2>/dev/null || echo Unknown)
_SYS := $(patsubst MSYS%,MSYS,$(_SYS))
_SYS := $(patsubst MINGW%,MinGW,$(_SYS))
ifneq ($(filter $(_SYS),MSYS MinGW),)
WIN32 := 1
V:=./v.exe
endif
ifeq ($(_SYS),Linux)
LINUX := 1
TCCOS := linux
endif
ifeq ($(_SYS),Darwin)
MAC := 1
TCCOS := macos
endif
ifeq ($(_SYS),FreeBSD)
TCCOS := freebsd
LDFLAGS += -lexecinfo
endif
ifeq ($(_SYS),NetBSD)
TCCOS := netbsd
LDFLAGS += -lexecinfo
endif
ifdef ANDROID_ROOT
ANDROID := 1
undefine LINUX
TCCOS := android
endif
#####
ifdef WIN32
TCCOS := windows
VCFILE := v_win.c
endif
TCCARCH := $(shell uname -m 2>/dev/null || echo unknown)
ifeq ($(TCCARCH),x86_64)
TCCARCH := amd64
else
ifneq ($(filter x86%,$(TCCARCH)),)
TCCARCH := i386
else
ifeq ($(TCCARCH),arm64)
TCCARCH := arm64
else
ifneq ($(filter arm%,$(TCCARCH)),)
TCCARCH := arm
# otherwise, just use the arch name
endif
endif
endif
endif
.PHONY: all clean fresh_vc fresh_tcc
ifdef prod
VFLAGS+=-prod
endif
all: latest_vc latest_tcc
ifdef WIN32
$(CC) $(CFLAGS) -std=c99 -municode -w -o $(V) $(VC)/$(VCFILE) $(LDFLAGS)
$(V) -o v2.exe $(VFLAGS) cmd/v
move /y v2.exe v.exe
else
$(CC) $(CFLAGS) -std=gnu99 -w -o $(V) $(VC)/$(VCFILE) -lm -lpthread $(LDFLAGS)
$(V) -o v2.exe $(VFLAGS) cmd/v
mv -f v2.exe v
endif
@echo "V has been successfully built"
@$(V) -version
clean:
rm -rf $(TMPTCC)
rm -rf $(VC)
ifndef local
latest_vc: $(VC)/.git/config
cd $(VC) && $(GITCLEANPULL)
else
latest_vc:
@echo "Using local vc"
endif
fresh_vc:
rm -rf $(VC)
$(GITFASTCLONE) $(VCREPO) $(VC)
ifndef local
latest_tcc: $(TMPTCC)/.git/config
cd $(TMPTCC) && $(GITCLEANPULL)
else
latest_tcc:
@echo "Using local tcc"
endif
fresh_tcc:
rm -rf $(TMPTCC)
ifndef local
# Check wether a TCC branch exists for the user's system configuration.
ifneq (,$(findstring thirdparty-$(TCCOS)-$(TCCARCH), $(shell git ls-remote --heads $(TCCREPO) | sed 's/^[a-z0-9]*\trefs.heads.//')))
$(GITFASTCLONE) --branch thirdparty-$(TCCOS)-$(TCCARCH) $(TCCREPO) $(TMPTCC)
else
@echo 'Pre-built TCC not available for thirdparty-$(TCCOS)-$(TCCARCH) at $(TCCREPO), will use the system compiler: $(CC)'
$(GITFASTCLONE) --branch thirdparty-unknown-unknown $(TCCREPO) $(TMPTCC)
endif
else
@echo "Using local tccbin"
endif
$(TMPTCC)/.git/config:
$(MAKE) fresh_tcc
$(VC)/.git/config:
$(MAKE) fresh_vc
asan:
$(MAKE) all CFLAGS='-fsanitize=address,undefined'
selfcompile:
$(V) -cg -o v cmd/v
selfcompile-static:
$(V) -cg -cflags '--static' -o v-static cmd/v
### NB: Please keep this Makefile and make.bat simple.
install:
@echo 'Please use `sudo ./v symlink` instead.'

156
Makefile
View File

@ -1,154 +1,8 @@
CC ?= cc CC ?= cc
CFLAGS ?=
LDFLAGS ?=
TMPDIR ?= /tmp
VROOT ?= .
VC ?= ./vc
V ?= ./v
VCREPO ?= https://github.com/vlang/vc
TCCREPO ?= https://github.com/vlang/tccbin
VCFILE := v.c all:
TMPTCC := $(VROOT)/thirdparty/tcc rm -rf vc/
TCCOS := unknown git clone --depth 1 --quiet https://github.com/vlang/vc
TCCARCH := unknown $(CC) -std=gnu11 -w -o v vc/v.c -lm -lexecinfo
GITCLEANPULL := git clean -xf && git pull --quiet rm -rf vc/
GITFASTCLONE := git clone --depth 1 --quiet --single-branch
#### Platform detections and overrides:
_SYS := $(shell uname 2>/dev/null || echo Unknown)
_SYS := $(patsubst MSYS%,MSYS,$(_SYS))
_SYS := $(patsubst MINGW%,MinGW,$(_SYS))
ifneq ($(filter $(_SYS),MSYS MinGW),)
WIN32 := 1
V:=./v.exe
endif
ifeq ($(_SYS),Linux)
LINUX := 1
TCCOS := linux
endif
ifeq ($(_SYS),Darwin)
MAC := 1
TCCOS := macos
endif
ifeq ($(_SYS),FreeBSD)
TCCOS := freebsd
LDFLAGS += -lexecinfo
endif
ifeq ($(_SYS),NetBSD)
TCCOS := netbsd
LDFLAGS += -lexecinfo
endif
ifdef ANDROID_ROOT
ANDROID := 1
undefine LINUX
TCCOS := android
endif
#####
ifdef WIN32
TCCOS := windows
VCFILE := v_win.c
endif
TCCARCH := $(shell uname -m 2>/dev/null || echo unknown)
ifeq ($(TCCARCH),x86_64)
TCCARCH := amd64
else
ifneq ($(filter x86%,$(TCCARCH)),)
TCCARCH := i386
else
ifeq ($(TCCARCH),arm64)
TCCARCH := arm64
else
ifneq ($(filter arm%,$(TCCARCH)),)
TCCARCH := arm
# otherwise, just use the arch name
endif
endif
endif
endif
.PHONY: all clean fresh_vc fresh_tcc
ifdef prod
VFLAGS+=-prod
endif
all: latest_vc latest_tcc
ifdef WIN32
$(CC) $(CFLAGS) -std=c99 -municode -w -o $(V) $(VC)/$(VCFILE) $(LDFLAGS)
$(V) -o v2.exe $(VFLAGS) cmd/v
move /y v2.exe v.exe
else
$(CC) $(CFLAGS) -std=gnu99 -w -o $(V) $(VC)/$(VCFILE) -lm -lpthread $(LDFLAGS)
$(V) -o v2.exe $(VFLAGS) cmd/v
mv -f v2.exe v
endif
@echo "V has been successfully built" @echo "V has been successfully built"
@$(V) -version
clean:
rm -rf $(TMPTCC)
rm -rf $(VC)
ifndef local
latest_vc: $(VC)/.git/config
cd $(VC) && $(GITCLEANPULL)
else
latest_vc:
@echo "Using local vc"
endif
fresh_vc:
rm -rf $(VC)
$(GITFASTCLONE) $(VCREPO) $(VC)
ifndef local
latest_tcc: $(TMPTCC)/.git/config
cd $(TMPTCC) && $(GITCLEANPULL)
else
latest_tcc:
@echo "Using local tcc"
endif
fresh_tcc:
rm -rf $(TMPTCC)
ifndef local
# Check wether a TCC branch exists for the user's system configuration.
ifneq (,$(findstring thirdparty-$(TCCOS)-$(TCCARCH), $(shell git ls-remote --heads $(TCCREPO) | sed 's/^[a-z0-9]*\trefs.heads.//')))
$(GITFASTCLONE) --branch thirdparty-$(TCCOS)-$(TCCARCH) $(TCCREPO) $(TMPTCC)
else
@echo 'Pre-built TCC not available for thirdparty-$(TCCOS)-$(TCCARCH) at $(TCCREPO), will use the system compiler: $(CC)'
$(GITFASTCLONE) --branch thirdparty-unknown-unknown $(TCCREPO) $(TMPTCC)
endif
else
@echo "Using local tccbin"
endif
$(TMPTCC)/.git/config:
$(MAKE) fresh_tcc
$(VC)/.git/config:
$(MAKE) fresh_vc
asan:
$(MAKE) all CFLAGS='-fsanitize=address,undefined'
selfcompile:
$(V) -cg -o v cmd/v
selfcompile-static:
$(V) -cg -cflags '--static' -o v-static cmd/v
### NB: Please keep this Makefile and make.bat simple.
install:
@echo 'Please use `sudo ./v symlink` instead.'