diff --git a/nsprpub/configure b/nsprpub/configure
index a3dbbe94b16a..9c34e105527a 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -4313,7 +4313,7 @@ EOF
     else
         CC="$CC -xstrconst"
         CXX="$CXX -Qoption cg -xstrconst"
-        if test -n "$BUILD_NUMBER" && test -z "$MOZ_OPTIMIZE"; then
+        if test -z "$MOZ_OPTIMIZE"; then
             CFLAGS="$CFLAGS -xs"
             CXXFLAGS="$CXXFLAGS -xs"
         fi
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 93dcc6efc8b1..057bad0887e5 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1548,7 +1548,7 @@ mips-sony-newsos*)
     else
         CC="$CC -xstrconst"
         CXX="$CXX -Qoption cg -xstrconst"
-        if test -n "$BUILD_NUMBER" && test -z "$MOZ_OPTIMIZE"; then
+        if test -z "$MOZ_OPTIMIZE"; then
             CFLAGS="$CFLAGS -xs"
             CXXFLAGS="$CXXFLAGS -xs"
         fi