diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2f4189..76bf6cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
         run: |
           brew install scons
           . ./build_libs_mac.sh Debug
-          scons platform=osx target=debug
+          scons platform=osx target=debug use_llvm=yes
 
   build-release-macos:
     runs-on: macos-latest
@@ -69,4 +69,4 @@ jobs:
         run: |
           brew install scons
           . ./build_libs_mac.sh Release
-          scons platform=osx target=release
+          scons platform=osx target=release use_llvm=yes
diff --git a/SConstruct b/SConstruct
index bfcb66a..fa4a02c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -45,7 +45,7 @@ if env['platform'] == "osx":
     cpp_library += '.osx'
     libgit2_lib_path += 'osx/'
     if env['target'] in ('debug', 'd'):
-        env.Append(CCFLAGS = ['-g','-O2', '-arch', 'x86_64'])
+        env.Append(CCFLAGS = ['-g','-O2', '-arch', 'x86_64', '-std=c++17'])
         env.Append(LINKFLAGS = ['-arch', 'x86_64'])
     else:
         env.Append(CCFLAGS = ['-g','-O3', '-arch', 'x86_64', '-std=c++17'])
@@ -68,7 +68,7 @@ elif env['platform'] == "windows":
     # that way you can run scons in a vs 2017 prompt and it will find all the required tools
     env.Append(ENV = os.environ)
 
-    env.Append(CCFLAGS = ['-DWIN32', '-D_WIN32', '-D_WINDOWS', '-W3', '-GR', '-D_CRT_SECURE_NO_WARNINGS'])
+    env.Append(CCFLAGS = ['-DWIN32', '-D_WIN32', '-D_WINDOWS', '-W3', '-GR', '-D_CRT_SECURE_NO_WARNINGS', '/std:c++17'])
     env.Append(LIBS=['Advapi32'])
     if env['target'] in ('debug', 'd'):
         env.Append(CCFLAGS = ['-EHsc', '-D_DEBUG', '-MDd'])