ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use -I for the vendor directory instead of -isystem.

Browse Source 
Fixes {fmt} from the system conflicting with our local vendored
copy of {fmt}.

Thanks to @slimture for testing.

Closes #2105.
This commit is contained in:
Sadie Powell 2024-09-08 23:28:39 +01:00
parent 73a98ce7be
commit a3668d75d6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-irctest.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
# Speed-up build (6 min -> 5 min)
- name: Precompile inspircd.h
run: c++ -isystem vendor include/inspircd.h
run: c++ -Ivendor include/inspircd.h
- name: Build and install
env:

2
make/template/main.mk
View File

@ -45,7 +45,7 @@ SYSTEM = @SYSTEM_NAME@
SOURCEPATH = @SOURCE_DIR@
BUILDPATH ?= $(SOURCEPATH)/build/@COMPILER_NAME@-@COMPILER_VERSION@
SOCKETENGINE = @SOCKETENGINE@
CORECXXFLAGS = -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -pipe -I"$(SOURCEPATH)/include" -isystem "$(SOURCEPATH)/vendor" -Wall -Wextra -Wfatal-errors -Woverloaded-virtual -Wpedantic -Wno-format-nonliteral -Wno-unused-parameter -DFMT_SHARED
CORECXXFLAGS = -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -pipe -I"$(SOURCEPATH)/include" -I"$(SOURCEPATH)/vendor" -Wall -Wextra -Wfatal-errors -Woverloaded-virtual -Wpedantic -Wno-format-nonliteral -Wno-unused-parameter -DFMT_SHARED
LDLIBS = @COMPILER_EXTRA_LDLIBS@
CORELDFLAGS = -fPIE -pie -L.
PICLDFLAGS = -fPIC -shared