Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
Domain Data Management Services
Seismic
Open ZGY
Commits
9f0fa874
Commit
9f0fa874
authored
Aug 19, 2021
by
Paal Kvamme
Browse files
Tweak the old version numbering scheme to account for g++ 10 and later.
parent
19464797
Changes
2
Hide whitespace changes
Inline
Side-by-side
scripts/Make.defs
View file @
9f0fa874
...
...
@@ -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)
...
...
sd-env/build-template.sh
View file @
9f0fa874
...
...
@@ -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
tarball
=
sdapi_linux64_local.tar.gz
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment