Merge pull request #3295 from pleroy/MacOSFilesystem

What do we say to the God of char8_t?
mockingbirdnest · Jan 22, 2022 · 59e53b8 · 59e53b8
2 parents e311211 + 6b72820
commit 59e53b8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -96,6 +96,7 @@ INCLUDES      := -I. -I$(DEP_DIR)glog/src \
 SHARED_ARGS   := \
 	-std=c++20 -stdlib=libc++ -O3 -g                              \
 	-fPIC -fexceptions -ferror-limit=1000 -fno-omit-frame-pointer \
+	-fno-char8_t                                                  \
 	-Wall -Wpedantic                                              \
 	-Wno-char-subscripts                                          \
 	-Wno-gnu-anonymous-struct                                     \
@@ -121,7 +122,7 @@ ifeq ($(UNAME_S),Linux)
 endif
 ifeq ($(UNAME_S),Darwin)
     INCLUDES += \
-			-include "base/macos_allocator_replacement.hpp"
+			-include "base/macos_allocator_replacement.hpp" \
 			-include "base/macos_filesystem_replacement.hpp"
     LIBS += -framework CoreFoundation
     SHARED_ARGS += \