Skip to content

Commit 17b46af

Browse files
authored
Linux - enable gcc 5.4 to use c++17 (#7406)
#changelog #linux
1 parent 95c075e commit 17b46af

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ PLATFORM_CXXVER = -std=c++17
141141
GCC_MAJOR := $(shell expr `gcc -dumpversion | cut -f1 -d.`)
142142
GCC_MINOR := $(shell expr `gcc -dumpversion | cut -f2 -d.`)
143143

144+
# $(info $(GCC_MAJOR))
145+
# $(info $(GCC_MINOR))
146+
# $(info ($(shell expr $(GCC_MAJOR) \>= 8), 1))
147+
# $(info ($(shell expr $(GCC_MINOR) \< 7), 1))
148+
144149
ifeq ("$(GCC_MAJOR)","4")
145150
ifeq ($(shell expr $(GCC_MINOR) \< 7), 1)
146151
PLATFORM_CXXVER = -std=c++0x
@@ -163,6 +168,9 @@ else
163168
endif
164169
PLATFORM_CXXFLAGS += -DGCC_HAS_REGEX
165170
endif
171+
ifeq ("$(GCC_MAJOR)","5")
172+
PLATFORM_CXXVER = -std=c++17
173+
endif
166174

167175
PLATFORM_CFLAGS = $(PLATFORM_CXXFLAGS)
168176
PLATFORM_CXXFLAGS += $(PLATFORM_CXXVER)

scripts/dev/download_libs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ if [ "$ARCH" == "" ]; then
115115
if [ "$ARCH" == "x86_64" ]; then
116116
GCC_VERSION=$(gcc -dumpversion | cut -f1 -d.)
117117
if [ $GCC_VERSION -eq 4 ]; then
118-
ARCH=64gcc4
118+
ARCH=64gcc6
119119
elif [ $GCC_VERSION -eq 5 ]; then
120-
ARCH=64gcc5
120+
ARCH=64gcc6
121121
else
122122
ARCH=64gcc6
123123
fi

0 commit comments

Comments
 (0)