diff --git a/build/core/ndk-common.sh b/build/core/ndk-common.sh
index 974f934..77cca66 100644
--- a/build/core/ndk-common.sh
+++ b/build/core/ndk-common.sh
@@ -272,6 +272,7 @@
     # reporting anomoly here.
     if [ "$HOST_OS" = darwin ] ; then
         if ! echo __LP64__ | (CCOPTS= gcc -E - 2>/dev/null) | grep -q __LP64__ ; then
+        # or if gcc -dM -E - < /dev/null | grep -q __LP64__; then
             HOST_ARCH=x86_64
         fi
     fi
@@ -708,6 +709,8 @@
             else
                 run tar j$TARFLAGS "$ARCHIVE" -C $DIR
             fi
+            # remove ._* files by MacOSX to preserve resource forks we don't need
+            find $DIR -name "\._*" -exec rm {} \;
             ;;
         *)
             panic "Cannot unpack archive with unknown extension: $ARCHIVE"
diff --git a/tests/build/issue39824-__BYTE_ORDER/BROKEN_BUILD b/tests/build/issue39824-__BYTE_ORDER/BROKEN_BUILD
deleted file mode 100644
index e69de29..0000000
--- a/tests/build/issue39824-__BYTE_ORDER/BROKEN_BUILD
+++ /dev/null
diff --git a/tests/build/issue39824-__BYTE_ORDER/jni/Android.mk b/tests/build/issue39824-__BYTE_ORDER/jni/Android.mk
index 9bd21ad..b483c02 100644
--- a/tests/build/issue39824-__BYTE_ORDER/jni/Android.mk
+++ b/tests/build/issue39824-__BYTE_ORDER/jni/Android.mk
@@ -5,3 +5,8 @@
 LOCAL_SRC_FILES := issue39824-__BYTE_ORDER.c
 include $(BUILD_EXECUTABLE)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := issue39824-_BYTE_ORDER
+LOCAL_SRC_FILES := issue39824-_BYTE_ORDER.c
+include $(BUILD_EXECUTABLE)
+
diff --git a/tests/build/issue39824-__BYTE_ORDER/jni/issue39824-_BYTE_ORDER.c b/tests/build/issue39824-__BYTE_ORDER/jni/issue39824-_BYTE_ORDER.c
new file mode 100644
index 0000000..444f23b
--- /dev/null
+++ b/tests/build/issue39824-__BYTE_ORDER/jni/issue39824-_BYTE_ORDER.c
@@ -0,0 +1,6 @@
+#include <endian.h>
+
+int main()
+{
+  return 0 * _BYTE_ORDER * __BYTE_ORDER;
+}