diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-26 10:31:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 10:31:52 +0100 |
| commit | d7e14aeba6630cb8bf61d5e6f8208572a092dcc2 (patch) | |
| tree | 38c2d78fff1e1ad15b0c2d66ba867ed86c1a3463 | |
| parent | b11ee739c37e7e8ed8cacb8a0aa99328242aedba (diff) | |
| parent | 680f436de36aed41f87f4179637192f3cdfb021b (diff) | |
| download | ATCD-d7e14aeba6630cb8bf61d5e6f8208572a092dcc2.tar.gz | |
Merge pull request #1424 from jwillemsen/jwi-macosx
Don't force c++11 through the github action, that should be the default
| -rw-r--r-- | .github/workflows/macosx.yml | 9 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_common.GNU | 15 |
2 files changed, 10 insertions, 14 deletions
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index c6420a4b2a0..014bece5fdd 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -10,12 +10,11 @@ jobs: build: strategy: matrix: - cxxstd: ["11"] os: [macos-10.15, macos-11.0] include: - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} - name: "${{ matrix.os }}-C++${{ matrix.cxxstd }}" + name: "${{ matrix.os }}-C++" env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO @@ -32,13 +31,9 @@ jobs: run: | '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - - name: Add c++${{ matrix.cxxstd }} platform_macros.GNU - run: | - 'c++${{ matrix.cxxstd }}=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - shell: pwsh - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | - '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + '${{ matrix.platform_file }}' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 1ba6dcd5107..342883b2855 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -27,21 +27,22 @@ CC ?= gcc CXX ?= g++ DCCFLAGS += -g DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) +DLD = $(CXX) +LD = $(CXX) #LIBS += -lstdc++.6 -lSystem -lSystemStubs -OCFLAGS += -O2 -RANLIB = ranlib -SOEXT = dylib -SOFLAGS += -dynamiclib -SOBUILD = -o $(VSHDIR)$*.dylib $< +OCFLAGS += -O2 +RANLIB = ranlib +SOEXT = dylib +SOFLAGS += -dynamiclib +SOBUILD = -o $(VSHDIR)$*.dylib $< # Test for template instantiation, add to SOFLAGS if versioned_so set, # add -E to LDFLAGS if using GNU ld ifeq ($(findstring g++,$(CXX)),)# include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU else + c++11 ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU endif |