File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -142,6 +142,8 @@ jobs:
142
142
GIT_COMMITTER_EMAIL : 41898282+github-actions[bot]@users.noreply.github.com
143
143
MACOS_VER_NUM : 14
144
144
CERT_IDENTITY : me
145
+ LDLIBS : -lgetargv
146
+ CXXFLAGS : -Iinclude
145
147
steps :
146
148
- uses : actions/checkout@v4
147
149
with :
Original file line number Diff line number Diff line change @@ -27,23 +27,22 @@ LIB_DIR = lib
27
27
PKG_DIR = pkg
28
28
FAKE_ROOT = fakeroot
29
29
CXX = clang++
30
- CPPFLAGS + = -MMD -MP
30
+ CPPFLAGS : = -MMD -MP
31
31
32
32
COMPILER_VERSION := $(shell $(CXX) --version | grep version | grep -o -m 1 "[0-9]\+\.[0-9]\+\.*[0-9]*" | head -n 1)
33
33
COMPILER_VERSION_NUMBER := $(shell echo $(COMPILER_VERSION) | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/')
34
34
CLANG_13_OR_MORE := $(shell expr $(COMPILER_VERSION_NUMBER) \>= 130106)
35
35
ifneq ($(CLANG_13_OR_MORE),0)
36
36
# supported: c++11, c++14, c++17, c++20
37
37
# future: c++2b
38
- CXXFLAGS := --std=c++20 -O3 -Iinclude
38
+ CXXFLAGS := --std=c++20 -O3 -Iinclude $(shell pkg-config --cflags getargv)
39
39
else
40
- CXXFLAGS := --std=c++17 -O3 -Iinclude
40
+ CXXFLAGS := --std=c++17 -O3 -Iinclude $(shell pkg-config --cflags getargv)
41
41
endif
42
- CXXFLAGS += $(shell pkg-config --cflags getargv)
43
42
44
43
EXTRA_CXXFLAGS := -pedantic-errors -Weverything -Wno-c++98-compat -Wno-pre-c++20-compat-pedantic -Wno-poison-system-directories
45
- LDFLAGS + = -Llib -fvisibility=default -fPIC
46
- LDLIBS + = $(shell pkg-config --libs getargv)
44
+ LDFLAGS : = -Llib -fvisibility=default -fPIC
45
+ LDLIBS : = $(shell pkg-config --libs getargv)
47
46
48
47
LIB_SHORT_NAME = getargv++
49
48
LIB_NAME = lib$(LIB_SHORT_NAME)
You can’t perform that action at this time.
0 commit comments