diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index 1e105b002..b2f86e6b3 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -114,6 +114,7 @@ ALWAYS_DYNAMIC_BASE=False
 
 FPMATH="Default"
 FPMATH_FLAGS="-mfpmath=sse -msse -msse2"
+FPMATH_ENABLED=getenv("FPMATH_ENABLED", "True")
 
 
 def check_output(cmd):
@@ -278,6 +279,9 @@ def test_gmp(cc):
 
 def test_fpmath(cc):
     global FPMATH_FLAGS
+    if FPMATH_ENABLED == "False":
+        FPMATH_FLAGS=""
+        return "Disabled"
     if is_verbose():
         print("Testing floating point support...")
     t = TempFile('tstsse.cpp')
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index de647ee9a..652f88f1c 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -1,6 +1,6 @@
 variables:
   ReleaseVersion: '4.8.15'
-  MacFlags: 'CXXFLAGS="-arch arm64" LINK_EXTRA_FLAGS="-arch arm64" SLINK_EXTRA_FLAGS="-arch arm64" CPPFLAGS="-arch arm64"'
+  MacFlags: 'CXXFLAGS="-arch arm64" LINK_EXTRA_FLAGS="-arch arm64" SLINK_EXTRA_FLAGS="-arch arm64" FPMATH_ENABLED=False'
 
 stages:
 - stage: Build