--- i2p-0.9.33/core/c/jcpuid/build.sh	2018-01-29 16:09:02.000000000 -0500
+++ i2p-0.9.33/core/c/jcpuid/build.sh	2018-03-19 00:43:11.434473132 -0400
@@ -57,20 +57,20 @@
 
 # Debian builds are presumed to be native, we don't need the -mxx flag unless cross-compile,
 # and this breaks the x32 build
-if [ -z "$DEBIANVERSION" ] ; then
-    if [ $BITS -eq 32 ]; then
-      export ABI=32
-      export CFLAGS="-m32 -mtune=i686 -march=i686"
-      export LDFLAGS="-m32"
-    elif [ $BITS -eq 64 ]; then
-      export ABI=64
-      export CFLAGS="-m64 -mtune=generic"
-      export LDFLAGS="-m64"
-    else
-      printf "BITS value \"$BITS\" not valid, please select 32 or 64\n" >&2
-      exit 1
-    fi
-fi
+#if [ -z "$DEBIANVERSION" ] ; then
+#    if [ $BITS -eq 32 ]; then
+#      export ABI=32
+#      export CFLAGS="-m32 -mtune=i686 -march=i686"
+#      export LDFLAGS="-m32"
+#    elif [ $BITS -eq 64 ]; then
+#      export ABI=64
+#      export CFLAGS="-m64 -mtune=generic"
+#      export LDFLAGS="-m64"
+#    else
+#      printf "BITS value \"$BITS\" not valid, please select 32 or 64\n" >&2
+#      exit 1
+#    fi
+#fi
 
 [ -z $ARCH ] && case `uname -m` in
     x86_64*|amd64)
@@ -155,6 +155,7 @@
 
 echo "Compiling C code..."
 rm -f ${LIBFILE}
-${CC_PREFIX}${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} src/*.c -o ${LIBFILE} || (echo "Failed to compile ${LIBFILE}"; exit 1)
-${CC_PREFIX}strip ${LIBFILE} || (echo "Failed to strip ${LIBFILE}" ; exit 1)
+echo ${CC_PREFIX}${CC} ${COMPILEFLAGS} ${CPPFLAGS} ${CFLAGS} ${LINKFLAGS} ${LDFLAGS} ${INCLUDES} src/*.c -o ${LIBFILE}
+${CC_PREFIX}${CC} ${COMPILEFLAGS} ${CPPFLAGS} ${CFLAGS} ${LINKFLAGS} ${LDFLAGS} ${INCLUDES} src/*.c -o ${LIBFILE} || (echo "Failed to compile ${LIBFILE}"; exit 1)
+#${CC_PREFIX}strip ${LIBFILE} || (echo "Failed to strip ${LIBFILE}" ; exit 1)
 echo Built `dirname $0`/${LIBFILE}