Skip to content
Snippets Groups Projects
Commit 4ecdb251 authored by Mark OLESEN's avatar Mark OLESEN
Browse files

CONFIG: add llvm-7.0.1

STYLE: generalize rule for obtaining compiler stem
parent c13199d3
No related merge requests found
...@@ -29,73 +29,76 @@ case ThirdParty: ...@@ -29,73 +29,76 @@ case ThirdParty:
switch ("$WM_COMPILER") switch ("$WM_COMPILER")
case Gcc: case Gcc:
case Gcc48: case Gcc48*:
set gcc_version=gcc-4.8.5 set gcc_version=gcc-4.8.5
breaksw breaksw
case Gcc49: case Gcc49*:
set gcc_version=gcc-4.9.4 set gcc_version=gcc-4.9.4
breaksw breaksw
case Gcc51: case Gcc51*:
set gcc_version=gcc-5.1.0 set gcc_version=gcc-5.1.0
breaksw breaksw
case Gcc52: case Gcc52*:
set gcc_version=gcc-5.2.0 set gcc_version=gcc-5.2.0
breaksw breaksw
case Gcc53: case Gcc53*:
set gcc_version=gcc-5.3.0 set gcc_version=gcc-5.3.0
breaksw breaksw
case Gcc54: case Gcc54*:
set gcc_version=gcc-5.4.0 set gcc_version=gcc-5.4.0
breaksw breaksw
case Gcc55: case Gcc55*:
set gcc_version=gcc-5.5.0 set gcc_version=gcc-5.5.0
breaksw breaksw
case Gcc61: case Gcc61*:
set gcc_version=gcc-6.1.0 set gcc_version=gcc-6.1.0
breaksw breaksw
case Gcc62: case Gcc62*:
set gcc_version=gcc-6.2.0 set gcc_version=gcc-6.2.0
breaksw breaksw
case Gcc63: case Gcc63*:
set gcc_version=gcc-6.3.0 set gcc_version=gcc-6.3.0
breaksw breaksw
case Gcc64: case Gcc64*:
set gcc_version=gcc-6.4.0 set gcc_version=gcc-6.4.0
breaksw breaksw
case Gcc71: case Gcc71*:
set gcc_version=gcc-7.1.0 set gcc_version=gcc-7.1.0
breaksw breaksw
case Gcc72: case Gcc72*:
set gcc_version=gcc-7.2.0 set gcc_version=gcc-7.2.0
breaksw breaksw
case Gcc73: case Gcc73*:
set gcc_version=gcc-7.3.0 set gcc_version=gcc-7.3.0
breaksw breaksw
case Gcc81: case Gcc81*:
set gcc_version=gcc-8.1.0 set gcc_version=gcc-8.1.0
breaksw breaksw
case Gcc82: case Gcc82*:
set gcc_version=gcc-8.2.0 set gcc_version=gcc-8.2.0
breaksw breaksw
case Clang: case Clang:
case Clang37: case Clang37*:
set clang_version=llvm-3.7.1 set clang_version=llvm-3.7.1
breaksw breaksw
case Clang38: case Clang38*:
set clang_version=llvm-3.8.1 set clang_version=llvm-3.8.1
breaksw breaksw
case Clang39: case Clang39*:
set clang_version=llvm-3.9.1 set clang_version=llvm-3.9.1
breaksw breaksw
case Clang40: case Clang40*:
set clang_version=llvm-4.0.1 set clang_version=llvm-4.0.1
breaksw breaksw
case Clang50: case Clang50*:
set clang_version=llvm-5.0.2 set clang_version=llvm-5.0.2
breaksw breaksw
case Clang60: case Clang60*:
set clang_version=llvm-6.0.1 set clang_version=llvm-6.0.1
breaksw breaksw
case Clang70*:
set clang_version=llvm-7.0.1
breaksw
default: default:
/bin/cat << UNKNOWN_COMPILER /bin/cat << UNKNOWN_COMPILER
=============================================================================== ===============================================================================
......
...@@ -27,72 +27,75 @@ ThirdParty) ...@@ -27,72 +27,75 @@ ThirdParty)
mpc_version=mpc-system mpc_version=mpc-system
case "$WM_COMPILER" in case "$WM_COMPILER" in
Gcc | Gcc48) Gcc | Gcc48*)
gcc_version=gcc-4.8.5 gcc_version=gcc-4.8.5
;; ;;
Gcc49) Gcc49*)
gcc_version=gcc-4.9.4 gcc_version=gcc-4.9.4
;; ;;
Gcc51) Gcc51*)
gcc_version=gcc-5.1.0 gcc_version=gcc-5.1.0
;; ;;
Gcc52) Gcc52*)
gcc_version=gcc-5.2.0 gcc_version=gcc-5.2.0
;; ;;
Gcc53) Gcc53*)
gcc_version=gcc-5.3.0 gcc_version=gcc-5.3.0
;; ;;
Gcc54) Gcc54*)
gcc_version=gcc-5.4.0 gcc_version=gcc-5.4.0
;; ;;
Gcc55) Gcc55*)
gcc_version=gcc-5.5.0 gcc_version=gcc-5.5.0
;; ;;
Gcc61) Gcc61*)
gcc_version=gcc-6.1.0 gcc_version=gcc-6.1.0
;; ;;
Gcc62) Gcc62*)
gcc_version=gcc-6.2.0 gcc_version=gcc-6.2.0
;; ;;
Gcc63) Gcc63*)
gcc_version=gcc-6.3.0 gcc_version=gcc-6.3.0
;; ;;
Gcc64) Gcc64*)
gcc_version=gcc-6.4.0 gcc_version=gcc-6.4.0
;; ;;
Gcc71) Gcc71*)
gcc_version=gcc-7.1.0 gcc_version=gcc-7.1.0
;; ;;
Gcc72) Gcc72*)
gcc_version=gcc-7.2.0 gcc_version=gcc-7.2.0
;; ;;
Gcc73) Gcc73*)
gcc_version=gcc-7.3.0 gcc_version=gcc-7.3.0
;; ;;
Gcc81) Gcc81*)
gcc_version=gcc-8.1.0 gcc_version=gcc-8.1.0
;; ;;
Gcc82) Gcc82*)
gcc_version=gcc-8.2.0 gcc_version=gcc-8.2.0
;; ;;
Clang | Clang37) Clang | Clang37*)
clang_version=llvm-3.7.1 clang_version=llvm-3.7.1
;; ;;
Clang38) Clang38*)
clang_version=llvm-3.8.1 clang_version=llvm-3.8.1
;; ;;
Clang39) Clang39*)
clang_version=llvm-3.9.1 clang_version=llvm-3.9.1
;; ;;
Clang40) Clang40*)
clang_version=llvm-4.0.1 clang_version=llvm-4.0.1
;; ;;
Clang50) Clang50*)
clang_version=llvm-5.0.2 clang_version=llvm-5.0.2
;; ;;
Clang60) Clang60*)
clang_version=llvm-6.0.1 clang_version=llvm-6.0.1
;; ;;
Clang70*)
clang_version=llvm-7.0.1
;;
*) *)
/bin/cat << UNKNOWN_COMPILER 1>&2 /bin/cat << UNKNOWN_COMPILER 1>&2
=============================================================================== ===============================================================================
......
...@@ -14,7 +14,7 @@ GLIBS = -lm ...@@ -14,7 +14,7 @@ GLIBS = -lm
GLIB_LIBS = GLIB_LIBS =
COMPILER_TYPE = $(shell echo $(WM_COMPILER) | tr -d [:digit:]) COMPILER_TYPE = $(shell echo "$(WM_COMPILER)" | sed -e 's/[0-9].*//')
DEFAULT_RULES = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_TYPE) DEFAULT_RULES = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_TYPE)
RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER) RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
WMAKE_BIN = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER) WMAKE_BIN = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
......
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