7 Commits

Author SHA1 Message Date
Thodoris Sotiropoulos 090c04f5de Merge 7695c01d98 into 70e03572b2 2023-07-28 17:56:19 +08:00
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
Rouben 65228e5c79 Merge pull request #40 from simonsmh/master
Update debian submodule
2020-05-19 17:44:42 -04:00
gnaggnoyil db75edf481 Fix bug in GCC's target platform detection under some non-English locales 2020-05-12 19:50:58 +08:00
Simon Shi cfc3e40505 update debian submodule 2020-05-12 13:26:29 +08:00
Rouben 5b08c8f2a3 Merge pull request #38 from rouben/master
vlmcsd-1113-2020-03-28-Hotbird64
2020-03-30 01:30:22 -04:00
Thodoris Sotiropoulos 7695c01d98 Fix faults in Make builds 2020-01-01 15:06:30 +02:00
2 changed files with 7 additions and 3 deletions
+1 -1
Submodule debian updated: 971ade7b0e...96200e41ef
+6 -2
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
@@ -158,7 +158,7 @@ else
DLL_NAME ?= ../lib/libkms.so DLL_NAME ?= ../lib/libkms.so
endif endif
BASECFLAGS = -DVLMCSD_COMPILER=\"$(notdir $(CC))\" -DVLMCSD_PLATFORM=\"$(TARGETPLATFORM)\" -DCONFIG=\"$(CONFIG)\" -DBUILD_TIME=$(shell date '+%s') -g -Os -fno-strict-aliasing -fomit-frame-pointer -ffunction-sections -fdata-sections BASECFLAGS = -DVLMCSD_COMPILER=\"$(notdir $(CC))\" -DVLMCSD_PLATFORM=\"$(TARGETPLATFORM)\" -DCONFIG=\"$(CONFIG)\" -DBUILD_TIME=$(shell date '+%s') -MD -g -Os -fno-strict-aliasing -fomit-frame-pointer -ffunction-sections -fdata-sections
BASELDFLAGS = BASELDFLAGS =
STRIPFLAGS = STRIPFLAGS =
CLIENTLDFLAGS = CLIENTLDFLAGS =
@@ -651,3 +651,7 @@ dnsclean:
help: help:
@echo "Help is available by typing 'make help' in directory $(shell realpath `pwd`/..). Use 'cd ..' to get there." @echo "Help is available by typing 'make help' in directory $(shell realpath `pwd`/..). Use 'cd ..' to get there."
OBJS=../build/*.o
# Pull-in dependencies generated by -MD
-include $(OBJS:.o=.d)