Auto merge of #39086 - aidanhs:aphs-local-rebuild-no-jemalloc, r=alexcrichton

[rust.git] / configure

diff --git a/configure b/configure
index a93a6c5a3a68559505a6ce69515e06767b31f100..208fb7e6836372a814ea9796450000b59284977a 100755 (executable)
--- a/configure
+++ b/configure
@@ -541,6 +541,18 @@ case $CFG_CPUTYPE in
         CFG_CPUTYPE=x86_64
         ;;
 
+    mips | mips64)
+        if [ "$CFG_CPUTYPE" = "mips64" ]; then
+            CFG_OSTYPE="${CFG_OSTYPE}abi64"
+        fi
+        ENDIAN=$(printf '\1' | od -dAn)
+        if [ "$ENDIAN" -eq 1 ]; then
+            CFG_CPUTYPE="${CFG_CPUTYPE}el"
+        elif [ "$ENDIAN" -ne 256 ]; then
+            err "unknown endianness: $ENDIAN (expecting 1 for little or 256 for big)"
+        fi
+        ;;
+
     BePC)
         CFG_CPUTYPE=i686
         ;;
@@ -733,7 +745,7 @@ fi
 case "$CFG_RELEASE_CHANNEL" in
     nightly )
        msg "overriding settings for $CFG_RELEASE_CHANNEL"
-       CFG_ENABLE_LLVM_ASSERTIONS=1
+        enable_if_not_disabled llvm-assertions
         # FIXME(stage0) re-enable this on the next stage0 now that #35566 is
         # fixed
         case "$CFG_BUILD" in