File tree 2 files changed +2
-13
lines changed
2 files changed +2
-13
lines changed Original file line number Diff line number Diff line change @@ -44,13 +44,6 @@ if(CONFIG_LIBUV)
44
44
endif ()
45
45
endif ()
46
46
47
- if (NOT DEFINED GCCVER)
48
- execute_process (COMMAND ${CMAKE_C_COMPILER} --version
49
- OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
50
- string (REGEX MATCH "\\ +\\ +.* ([0-9]+)\\ .[0-9]+" GCC_VERSION_REGEX
51
- "${GCC_VERSION_OUTPUT} " )
52
- set (GCCVER ${CMAKE_MATCH_1} )
53
- endif ()
54
47
# ############################################################################
55
48
# Flags
56
49
# ############################################################################
@@ -60,7 +53,7 @@ if(CONFIG_LIBUV)
60
53
-DDEF_THREADPOOL_STACKSIZE=CONFIG_LIBUV_THREAD_STACKSIZE
61
54
-DDEF_THREADPOOL_PRIORITY=CONFIG_LIBUV_THREADPOOL_PRIORITY)
62
55
63
- if (GCCVER EQUAL 12)
56
+ if (GCCVER GREATER_EQUAL 12)
64
57
list (APPEND CFLAGS -Wno-dangling-pointer)
65
58
endif ()
66
59
# ############################################################################
Original file line number Diff line number Diff line change @@ -54,11 +54,7 @@ CFLAGS += -DDEF_THREADPOOL_PRIORITY=CONFIG_LIBUV_THREADPOOL_PRIORITY
54
54
CFLAGS += -DMAX_EPOLL_EVENTS=CONFIG_LIBUV_MAX_EPOLL_EVENTS
55
55
CFLAGS += -DPREP_EVENT_SIZE=CONFIG_LIBUV_PREP_EVENT_SIZE
56
56
57
- ifeq ($(GCCVER ) ,)
58
- export GCCVER = $(shell $(CC ) --version | grep gcc | sed -r 's/.* ([0-9]+\.[0-9]+) .*/\1/' | cut -d'.' -f1)
59
- endif
60
-
61
- ifeq ($(GCCVER ) ,12)
57
+ ifeq ($(shell expr "$(GCCVER ) " \>= 12) , 1)
62
58
CFLAGS += -Wno-dangling-pointer
63
59
endif
64
60
You can’t perform that action at this time.
0 commit comments