2 Commits

Author SHA1 Message Date
Wind4 70e03572b2 Merge pull request #41 from gnaggnoyil/master
Fix bug in GCC's target platform detection under some non-English locales
2023-07-28 17:56:01 +08:00
gnaggnoyil db75edf481 Fix bug in GCC's target platform detection under some non-English locales 2020-05-12 19:50:58 +08:00
2 changed files with 12 additions and 10 deletions
+11 -9
View File
@@ -1,5 +1,7 @@
.NOTPARALLEL: .NOTPARALLEL:
MAX_THREADS ?= 16
PROGRAM_NAME ?= bin/vlmcsd PROGRAM_NAME ?= bin/vlmcsd
CLIENT_NAME ?= bin/vlmcs CLIENT_NAME ?= bin/vlmcs
MULTI_NAME ?= bin/vlmcsdmulti MULTI_NAME ?= bin/vlmcsdmulti
@@ -102,30 +104,30 @@ endif
.DEFAULT: .DEFAULT:
+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build) +@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
+@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME) +@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
all: all:
+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build) +@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
+@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME) +@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
clean: clean:
+@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME) +@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+@$(MAKE) -C man $@ +@$(MAKE) -j$(MAX_THREADS) -C man $@
alldocs: alldocs:
+@$(MAKE) -C man $@ +@$(MAKE) -j$(MAX_THREADS) -C man $@
dosdocs: dosdocs:
+@$(MAKE) -C man $@ +@$(MAKE) -j$(MAX_THREADS) -C man $@
unixdocs: unixdocs:
+@$(MAKE) -C man $@ +@$(MAKE) -j$(MAX_THREADS) -C man $@
htmldocs: htmldocs:
+@$(MAKE) -C man $@ +@$(MAKE) -j$(MAX_THREADS) -C man $@
pdfdocs: pdfdocs:
+@$(MAKE) -C man $@ +@$(MAKE) -j$(MAX_THREADS) -C man $@
GNUmakefile: GNUmakefile:
+1 -1
View File
@@ -70,7 +70,7 @@ VERBOSE ?= NO
################################################################################ ################################################################################
CC ?= gcc CC ?= gcc
TARGETPLATFORM := $(shell LANG=en_US.UTF-8 $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ') TARGETPLATFORM := $(shell LANG=en_US.UTF-8 LANGUAGE=en_US $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ')
ifneq (,$(findstring darwin,$(TARGETPLATFORM))) ifneq (,$(findstring darwin,$(TARGETPLATFORM)))
DARWIN := 1 DARWIN := 1