Commit 9f0fa874 authored by Paal Kvamme's avatar Paal Kvamme
Browse files

Tweak the old version numbering scheme to account for g++ 10 and later.

parent 19464797
......@@ -38,7 +38,7 @@ export AZURE_BUILDID ?= dev0
# (centos, ubuntu) about the environment. This only works
# as long as no two distros use the exact same compiler.
GCCVERSION := $(shell ($(CXX) -dumpfullversion 2>/dev/null || $(CXX) -dumpversion) | sed -e 's;[0-9][0-9][0-9]*;9;g' -e 's;\.;;g')
GCCVERSION := $(shell ($(CXX) -dumpfullversion 2>/dev/null || $(CXX) -dumpversion) | sed -e 's;\.[0-9][0-9][0-9]*;.9;g' -e 's;\.;;g')
MYGCCVERS := $(shell echo $(GCCVERSION) | sed -e 's;[0-9]$$;;')
export PLATFORM := Lin64_gcc$(GCCVERSION)
......@@ -145,7 +145,7 @@ tar zcf ../sdapi_linux64.tar.gz -C tmp version.txt include lib
set +e
GCCVERSION=$(g++ -dumpversion 2>/dev/null)
expr x"$GCCVERSION" : '.*\.' >/dev/null || GCCVERSION=$(g++ -dumpfullversion 2>/dev/null)
PLATFORM=Lin64_gcc$(echo "$GCCVERSION" | sed -e 's;[0-9][0-9][0-9]*;9;g' -e 's;\.;;g')
PLATFORM=Lin64_gcc$(echo "$GCCVERSION" | sed -e 's;\.[0-9][0-9][0-9]*;.9;g' -e 's;\.;;g')
test ${PLATFORM} != Lin64_gcc492 || PLATFORM=Lin64_gcc485
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment