Skip to content

Commit 7f3dc64

Browse files
committed
try to fix CI
1 parent 9debdab commit 7f3dc64

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/actions.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ jobs:
142142
GIT_COMMITTER_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
143143
MACOS_VER_NUM: 14
144144
CERT_IDENTITY: me
145+
LDLIBS: -lgetargv
146+
CXXFLAGS: -Iinclude
145147
steps:
146148
- uses: actions/checkout@v4
147149
with:

Makefile-variables

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,22 @@ LIB_DIR = lib
2727
PKG_DIR = pkg
2828
FAKE_ROOT = fakeroot
2929
CXX = clang++
30-
CPPFLAGS += -MMD -MP
30+
CPPFLAGS := -MMD -MP
3131

3232
COMPILER_VERSION := $(shell $(CXX) --version | grep version | grep -o -m 1 "[0-9]\+\.[0-9]\+\.*[0-9]*" | head -n 1)
3333
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/')
3434
CLANG_13_OR_MORE := $(shell expr $(COMPILER_VERSION_NUMBER) \>= 130106)
3535
ifneq ($(CLANG_13_OR_MORE),0)
3636
# supported: c++11, c++14, c++17, c++20
3737
# future: c++2b
38-
CXXFLAGS := --std=c++20 -O3 -Iinclude
38+
CXXFLAGS := --std=c++20 -O3 -Iinclude $(shell pkg-config --cflags getargv)
3939
else
40-
CXXFLAGS := --std=c++17 -O3 -Iinclude
40+
CXXFLAGS := --std=c++17 -O3 -Iinclude $(shell pkg-config --cflags getargv)
4141
endif
42-
CXXFLAGS += $(shell pkg-config --cflags getargv)
4342

4443
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)
4746

4847
LIB_SHORT_NAME = getargv++
4948
LIB_NAME = lib$(LIB_SHORT_NAME)

0 commit comments

Comments
 (0)