diff --git a/build.sh b/build.sh
index e94518e70..d73119a08 100755
--- a/build.sh
+++ b/build.sh
@@ -9,13 +9,11 @@ set -eu -o pipefail
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     ./util/build.sh --disable-tests $@
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-    # code from ./util/build.sh needs to be ported to support --disable-tests
-    #./util/build-mac.sh --disable-tests $@
-    ./util/build-mac.sh $@
+    ./util/build-mac.sh --disable-tests $@
 elif [[ "$OSTYPE" == "msys"* ]]; then
     ./util/build-win.sh --disable-tests $@
-elif [[ "$OSTYPE" == "freebsd"* ]]; then
-    ./util/build.sh --disable-tests $@
+#elif [[ "$OSTYPE" == "freebsd"* ]]; then
+    # placeholder
 else
     echo "Unable to detect your OS. What are you using?"
 fi
diff --git a/util/build-mac.sh b/util/build-mac.sh
index 89a638b89..745a72238 100755
--- a/util/build-mac.sh
+++ b/util/build-mac.sh
@@ -46,6 +46,13 @@ PREFIX="$(pwd)/depends/$TRIPLET"
 
 make "$@" -C ./depends/ V=1 NO_QT=1
 
+#BUILD CCLIB
+WD=$PWD
+cd src/cc
+echo $PWD
+./makecustom
+cd $WD
+
 # Build RandomX
 cd src/RandomX
 if [ -d "build" ]
diff --git a/util/build-win.sh b/util/build-win.sh
index 3b87128ac..f3498530e 100755
--- a/util/build-win.sh
+++ b/util/build-win.sh
@@ -18,6 +18,13 @@ cd ..
 
 CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
 
+# Build CryptoConditions stuff
+WD=$PWD
+cd src/cc
+echo $PWD
+./makecustom
+cd $WD
+
 # Build RandomX
 cd src/RandomX
 if [ -d "build" ]