Skip to content
Snippets Groups Projects

Fix Debian (.deb) build from making (Project_root)/bin/Linux

Merged Fix Debian (.deb) build from making (Project_root)/bin/Linux
bitten2up/SRB2:master into master
Merged bitten2up requested to merge bitten2up/SRB2:master into master
Viewing commit 1a8ec797
Show latest version
1 file
+ 8
− 4
Compare changes
  • Side-by-side
  • Inline
  • 1a8ec797
    Golden
    Makefile: Improve gcc detection · 1a8ec797
    Golden authored 
    Wasn't working for me until I fixed it.
Turns out gcc really doesn't like giving its name out.
Most of the time it reads argv[0].
src/Makefile.d/detect.mk
+ 8
− 4
@@ -71,13 +71,17 @@ latest_gcc_version:=10.2
@@ -71,13 +71,17 @@ latest_gcc_version:=10.2
# manually set. And don't bother if this is a clean only
# manually set. And don't bother if this is a clean only
# run.
# run.
ifeq (,$(call Wildvar,GCC% destructive))
ifeq (,$(call Wildvar,GCC% destructive))
version:=$(shell $(CC) --version)
 
# can't use $(CC) --version here since that uses argv[0] to display the name
 
# also gcc outputs the information to stderr, so I had to do 2>&1
 
# this program really doesn't like identifying itself
 
version:=$(shell $(CC) -v 2>&1)
# check if this is in fact GCC
# check if this is in fact GCC
ifneq (,$(or $(findstring gcc,$(version)),\
ifneq (,$(findstring gcc version,$(version)))
$(findstring GCC,$(version))))
version:=$(shell $(CC) -dumpversion)
# in stark contrast to the name, gcc will give me a nicely formatted version number for free
 
version:=$(shell $(CC) -dumpfullversion)
# Turn version into words of major, minor
# Turn version into words of major, minor
v:=$(subst ., ,$(version))
v:=$(subst ., ,$(version))