1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index d388f1e8..edf82828 100755
--- a/configure
+++ b/configure
@@ -218,6 +218,7 @@ libffi_cflags=
 darwin_target=
 solaris_target=
 build_id=
+android_target=
 nan_boxing=
 nan_boxing_given=
 
@@ -1269,6 +1270,7 @@ if ! [ $darwin_target ] ; then
 
   if [ "$($make conftest.android)" = "yes" ] ; then
     printf "yes\n"
+    android_target=y
     lang_flags="$lang_flags -U__ANDROID_API__ -D__ANDROID_API__=65535 -D_BSD_SOURCE"
     printf "Regenerating config.make ..."
     gen_config_make
@@ -1599,6 +1601,9 @@ if [ -n "$nan_boxing" ] ; then
     printf "Warning: NaN boxing disabled: it requires 64 bit pointers\n"
   else
     printf "#define CONFIG_NAN_BOXING 1\n" >> config.h
+    if [ -n "$android_target" ] ; then
+      printf "#define CONFIG_NAN_BOXING_STRIP_TAG 1\n" >> config.h
+    fi
   fi
 fi