diff --git a/config.h.in b/config.h.in
index 237349bc..1aa0cf2a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -54,6 +54,9 @@
 /* We have found package ZLIB */
 #undef HAVE_ZLIB
 
+/* Check for older build tools and use simpler code with old tools */
+#undef HOMEBREW_OLD_VERSION_OF_MAC
+
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
diff --git a/configure b/configure
index 79907d0e..ea30da13 100755
--- a/configure
+++ b/configure
@@ -823,6 +823,7 @@ with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_homebrewCLT
 enable_dependency_tracking
 enable_silent_rules
 '
@@ -1552,6 +1553,9 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
+  --with-homebrewCLT=<CLT Version>
+                          Define what version of the CLT is being used
+
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -18239,6 +18243,24 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
+
+# Check whether --with-homebrewCLT was given.
+if test ${with_homebrewCLT+y}
+then :
+  withval=$with_homebrewCLT;
+fi
+
+if test "x${with_homebrewCLT}" != "x"
+then :
+
+
+printf "%s\n" "#define HOMEBREW_OLD_VERSION_OF_MAC 1" >>confdefs.h
+
+        subconfigure="${subconfigure} --with-homebrewCLT=${with_homebrewCLT}"
+
+
+fi
+
 subconfigure="${subconfigure} --with-thorserialize-root=$(pwd)/build "
 
 
diff --git a/configure.ac b/configure.ac
index 993e43f3..22e3a588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,18 @@ int main() {
 
 LT_INIT
 
+AC_ARG_WITH(
+    [homebrewCLT],
+    AS_HELP_STRING([--with-homebrewCLT=<CLT Version>], [Define what version of the CLT is being used])
+)
+AS_IF(
+    [test "x${with_homebrewCLT}" != "x"],
+    [
+        AC_DEFINE([HOMEBREW_OLD_VERSION_OF_MAC], [1], [Check for older build tools and use simpler code with old tools])
+        subconfigure="${subconfigure} --with-homebrewCLT=${with_homebrewCLT}"
+    ]
+)
+
 subconfigure="${subconfigure} --with-thorserialize-root=$(pwd)/build "
 
 AX_THOR_FEATURE_HEADER_ONLY_VARIANT([THORS_SERIALIZER])
diff --git a/third/ThorsSerializer b/third/ThorsSerializer
index 5a91be6b..bda37353 160000
--- a/third/ThorsSerializer
+++ b/third/ThorsSerializer
@@ -1 +1 @@
-Subproject commit 5a91be6bb5250ab1713495d8b9158563f54079bb
+Subproject commit bda37353a102cef6829f9a86d804c177765b4d61