diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-20 16:35:04 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-20 16:35:04 +0100 |
| commit | fd5c368d5c7b26ff2a44446bd215e28ffc07b033 (patch) | |
| tree | f345667ac67100a8acd7db1b2c826d61be110399 | |
| parent | 9740e05c8e2f2c906444bf6b4ae01dd24e39cf39 (diff) | |
| download | ATCD-fd5c368d5c7b26ff2a44446bd215e28ffc07b033.tar.gz | |
Remove clang5
* .github/workflows/linux.yml:
* ACE/include/makeinclude/platform_linux_clang.GNU:
| -rw-r--r-- | .github/workflows/linux.yml | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_clang.GNU | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 50a5f38d2ff..a0f771a303c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -62,11 +62,6 @@ jobs: optional_macros: CCFLAGS+=-std=c++20 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU os: ubuntu-22.04 - - CC: clang-5.0 - CXX: clang++-5.0 - PackageDeps: clang-5.0 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 - CC: clang-6.0 CXX: clang++-6.0 PackageDeps: clang-6.0 diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 48a5e346241..a0fed4aa604 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -18,20 +18,6 @@ else CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') endif -# clang5/6/7/8 have C++11 as default C++ version, enable this to be C++14 -ifeq ($(findstring $(CXX_MAJOR_VERSION),5),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif -ifeq ($(findstring $(CXX_MAJOR_VERSION),6),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif -ifeq ($(findstring $(CXX_MAJOR_VERSION),7),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif -ifeq ($(findstring $(CXX_MAJOR_VERSION),8),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif - CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) |