Merge branch 'jed/fix-CC_VENDOR-ubuntu' [PR #501]

* jed/fix-CC_VENDOR-ubuntu:
  make: another fix for CC_VENDOR on Ubuntu
  make: fix CC_VENDOR identification on Ubuntu

Author: jedbrown

Makefile

@@ -74,7 +74,7 @@ endif
 # export LSAN_OPTIONS=suppressions=.asanignore
 AFLAGS = -fsanitize=address #-fsanitize=undefined -fno-omit-frame-pointer
 
-CC_VENDOR := $(firstword $(filter gcc clang icc XL,$(shell $(CC) --version)))
+CC_VENDOR := $(patsubst gcc%,gcc,$(firstword $(filter gcc% clang icc XL,$(shell $(CC) --version))))
 FC_VENDOR := $(firstword $(filter GNU ifort XL,$(shell $(FC) --version 2>&1 || $(FC) -qversion)))
 
 # Default extra flags by vendor