diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-31 19:09:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 19:09:54 +0100 |
| commit | 6d9ac6c81aaf00b0ff733c72068ab5671a998e48 (patch) | |
| tree | e978ae3f3a46fbd7995ec7acf03a737efdd91362 | |
| parent | 55f58cb6a53bf7d6b1e68fbeba8840ebee8b315d (diff) | |
| parent | c2d9750574dd85836f5f1b507544d49f04825eb5 (diff) | |
| download | ATCD-6d9ac6c81aaf00b0ff733c72068ab5671a998e48.tar.gz | |
Merge pull request #735 from jwillemsen/jwi-clangdefaultsettings
Make it possible to override CXX/CC with clang and extended CI configurations
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_clang.GNU | 5 | ||||
| -rw-r--r-- | azure-pipelines.yml | 29 |
2 files changed, 28 insertions, 6 deletions
diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 303cc580393..18358952714 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -1,11 +1,10 @@ - # This file should allow ACE to be built on Linux, using the clang compiler. include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU ifeq ($(insure),0) - CC = clang - CXX = clang++ + CC ?= clang + CXX ?= clang++ endif ifndef CXX_VERSION diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 270075fc9c1..d177d0138c9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,7 +14,6 @@ jobs: pool: vmImage: vs2017-win2016 strategy: - maxParallel: 4 matrix: Debug64: BuildPlatform: x64 @@ -100,8 +99,32 @@ jobs: timeoutInMinutes: 90 pool: vmImage: ubuntu-16.04 + strategy: + matrix: + GCC4: + CC: gcc + CXX: g++ + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + GCC6: + CC: gcc-6 + CXX: g++-6 + PackageDeps: g++-6 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + GCC7: + CC: gcc-7 + CXX: g++-7 + PackageDeps: g++-7 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + GCC8: + CC: gcc-8 + CXX: g++-8 + PackageDeps: g++-8 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU steps: - - script: sudo apt-get --yes update && sudo apt-get --yes install libxerces-c-dev libssl-dev + - script: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt-get --yes update + sudo apt-get --yes install libxerces-c-dev libssl-dev $(PackageDeps) displayName: install system package dependencies - powershell: | '#include "ace/config-linux.h"' > $(ACE_ROOT)/ace/config.h @@ -113,7 +136,7 @@ jobs: - powershell: | 'xerces3=1' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU 'ssl=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU - 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU + "$(platform_file)" >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU displayName: Create platform_macros file - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) displayName: git clone MPC |