From bada6666c70977a058755ccf232e7d67b24adeed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:21:29 +0200 Subject: New upstream release --- xsd/dist/examples/build/cxx/compilers.make | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'xsd/dist/examples/build/cxx/compilers.make') diff --git a/xsd/dist/examples/build/cxx/compilers.make b/xsd/dist/examples/build/cxx/compilers.make index b8d5538..a7f6296 100644 --- a/xsd/dist/examples/build/cxx/compilers.make +++ b/xsd/dist/examples/build/cxx/compilers.make @@ -1,6 +1,5 @@ # file : examples/build/cxx/compilers.make -# author : Boris Kolpackov -# copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file CXX := g++ @@ -43,13 +42,13 @@ endif # Clang # ifeq ($(cxx_id),) -ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.* clang .*$$//'),) +ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.*clang.*$$//'),) cxx_id := clang endif endif ifeq ($(cxx_id),) -ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.* Clang .*$$//'),) +ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.*Clang.*$$//'),) cxx_id := clang endif endif @@ -65,27 +64,15 @@ endif # HP C++ (aCC) # -# aCC3 and aCC6 are two very different compilers so we will call them -# hp3 and hp6. -# - -# 3 -ifeq ($(cxx_id),) -ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP ANSI C.. .* A\.03\..*$$//'),) -cxx_id := hp3 -endif -endif - -# 6 ifeq ($(cxx_id),) ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP aC..\/ANSI C .* A\.06\..*$$//'),) -cxx_id := hp6 +cxx_id := hp endif endif ifeq ($(cxx_id),) ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP C\/aC.. .* A\.06\..*$$//'),) -cxx_id := hp6 +cxx_id := hp endif endif -- cgit v1.2.3