File tree Expand file tree Collapse file tree 4 files changed +12
-16
lines changed Expand file tree Collapse file tree 4 files changed +12
-16
lines changed Original file line number Diff line number Diff line change @@ -12,15 +12,14 @@ endif
12
12
ifeq ($(BUILD_ENV_ ) ,MSVC)
13
13
excluded_tests = -X gcc-only
14
14
else
15
+ ifeq ($(BUILD_ENV_ ) ,OSX)
15
16
# In MacOS, a change in the assert.h header file
16
17
# is causing template errors when exercising the
17
18
# C++ front end (because of a transitive include
18
19
# of <type_traits>) for files that include the
19
20
# <assert.h> or <cassert> headers.
20
- OS := $(shell uname)
21
- ifeq ($(OS),Darwin)
22
- excluded_tests = -X macos-assert-broken
23
- endif
21
+ excluded_tests = -X macos-assert-broken
22
+ endif
24
23
endif
25
24
26
25
test :
Original file line number Diff line number Diff line change @@ -6,15 +6,14 @@ include ../../src/common
6
6
ifeq ($(BUILD_ENV_ ) ,MSVC)
7
7
excluded_tests = -X gcc-only -X winbug
8
8
else
9
+ ifeq ($(BUILD_ENV_ ) ,OSX)
9
10
# In MacOS, a change in the assert.h header file
10
11
# is causing template errors when exercising the
11
12
# C++ front end (because of a transitive include
12
13
# of <type_traits>) for files that include the
13
14
# <assert.h> or <cassert> headers.
14
- OS := $(shell uname)
15
- ifeq ($(OS),Darwin)
16
- excluded_tests = -X macos-assert-broken
17
- endif
15
+ excluded_tests = -X macos-assert-broken
16
+ endif
18
17
endif
19
18
20
19
test :
Original file line number Diff line number Diff line change @@ -12,15 +12,14 @@ endif
12
12
ifeq ($(BUILD_ENV_ ) ,MSVC)
13
13
excluded_tests = -X gcc-only -X winbug
14
14
else
15
+ ifeq ($(BUILD_ENV_ ) ,OSX)
15
16
# In MacOS, a change in the assert.h header file
16
17
# is causing template errors when exercising the
17
18
# C++ front end (because of a transitive include
18
19
# of <type_traits>) for files that include the
19
20
# <assert.h> or <cassert> headers.
20
- OS := $(shell uname)
21
- ifeq ($(OS),Darwin)
22
- excluded_tests = -X macos-assert-broken
23
- endif
21
+ excluded_tests = -X macos-assert-broken
22
+ endif
24
23
endif
25
24
26
25
test :
Original file line number Diff line number Diff line change @@ -12,15 +12,14 @@ endif
12
12
ifeq ($(BUILD_ENV_ ) ,MSVC)
13
13
excluded_tests = -X gcc-only -X winbug
14
14
else
15
+ ifeq ($(BUILD_ENV_ ) ,OSX)
15
16
# In MacOS, a change in the assert.h header file
16
17
# is causing template errors when exercising the
17
18
# C++ front end (because of a transitive include
18
19
# of <type_traits>) for files that include the
19
20
# <assert.h> or <cassert> headers.
20
- OS := $(shell uname)
21
- ifeq ($(OS),Darwin)
22
- excluded_tests = -X macos-assert-broken
23
- endif
21
+ excluded_tests = -X macos-assert-broken
22
+ endif
24
23
endif
25
24
26
25
default : tests.log
You can’t perform that action at this time.
0 commit comments