Small fix.

.gitignore

@@ -1,7 +1,10 @@
 /*-src
+/*-x64
+/*-x86
 /*.exe
 /*.pem
 /*.txt
 /*.zip
-/.libs
 /.bin
+/.libs
+/.release

build.sh

@@ -9,10 +9,12 @@ set -e
 
 case "$(cc -dumpmachine)" in
   i686-*)
+    readonly MY_ARCH=x86
     readonly MY_MARCH=i386
     readonly MY_MTUNE=intel
     ;;
   x86_64-*)
+    readonly MY_ARCH=x64
     readonly MY_MARCH=x86-64
     readonly MY_MTUNE=corei7
     ;;
@@ -23,9 +25,9 @@ case "$(cc -dumpmachine)" in
 esac
 
 readonly BASE_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
-readonly LIBS_DIR="${BASE_DIR}/.libs/${MY_MARCH}"
+readonly LIBS_DIR="${BASE_DIR}/.libs/${MY_ARCH}"
 
-find "${BASE_DIR}" -maxdepth 1 -type d -name "*-${MY_MARCH}" -exec rm -rf "{}" \;
+find "${BASE_DIR}" -maxdepth 1 -type d -name "*-${MY_ARCH}" -exec rm -rf "{}" \;
 rm -rf "${LIBS_DIR}" && mkdir -p "${LIBS_DIR}/include" "${LIBS_DIR}/lib"
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,7 +50,7 @@ wget -4 -P "${LIBS_DIR}" https://curl.se/docs/manpage.html
 # zlib
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== zlib ====================\n\n"
-readonly ZLIB_DIR="${BASE_DIR}/zlib-${MY_MARCH}"
+readonly ZLIB_DIR="${BASE_DIR}/zlib-${MY_ARCH}"
 pkg_zlib="$(find "${LIBS_DIR}" -maxdepth 1 -name 'zlib-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${ZLIB_DIR}" && mkdir "${ZLIB_DIR}"
 tar -xvf "${pkg_zlib}" --strip-components=1 -C "${ZLIB_DIR}"
@@ -62,7 +64,7 @@ popd
 # Zstandard
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== Zstandard ====================\n\n"
-readonly ZSTD_DIR="${BASE_DIR}/zstd-${MY_MARCH}"
+readonly ZSTD_DIR="${BASE_DIR}/zstd-${MY_ARCH}"
 pkg_zstd="$(find "${LIBS_DIR}" -maxdepth 1 -name 'zstd-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${ZSTD_DIR}" && mkdir "${ZSTD_DIR}"
 tar -xvf "${pkg_zstd}" --strip-components=1 -C "${ZSTD_DIR}"
@@ -76,7 +78,7 @@ popd
 # Brotli
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== Brotli ====================\n\n"
-readonly BROT_DIR="${BASE_DIR}/brotli-${MY_MARCH}"
+readonly BROT_DIR="${BASE_DIR}/brotli-${MY_ARCH}"
 pkg_brot="$(find "${LIBS_DIR}" -maxdepth 1 -name 'brotli-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${BROT_DIR}" && mkdir "${BROT_DIR}"
 tar -xvf "${pkg_brot}" --strip-components=1 -C "${BROT_DIR}"
@@ -92,7 +94,7 @@ popd
 # OpenSSL
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== OpenSSL ====================\n\n"
-readonly OSSL_DIR="${BASE_DIR}/openssl-${MY_MARCH}"
+readonly OSSL_DIR="${BASE_DIR}/openssl-${MY_ARCH}"
 pkg_ossl="$(find "${LIBS_DIR}" -maxdepth 1 -name 'openssl-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${OSSL_DIR}" && mkdir "${OSSL_DIR}"
 tar -xvf "${pkg_ossl}" --strip-components=1 -C "${OSSL_DIR}"
@@ -110,7 +112,7 @@ popd
 # libssh2
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== libssh2 ====================\n\n"
-readonly SSH2_DIR="${BASE_DIR}/libssh2-${MY_MARCH}"
+readonly SSH2_DIR="${BASE_DIR}/libssh2-${MY_ARCH}"
 pkg_ssh2="$(find "${LIBS_DIR}" -maxdepth 1 -name 'libssh2-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${SSH2_DIR}" && mkdir "${SSH2_DIR}"
 tar -xvf "${pkg_ssh2}" --strip-components=1 -C "${SSH2_DIR}"
@@ -125,7 +127,7 @@ popd
 # nghttp2
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== nghttp2 ====================\n\n"
-readonly NGH2_DIR="${BASE_DIR}/nghttp2-${MY_MARCH}"
+readonly NGH2_DIR="${BASE_DIR}/nghttp2-${MY_ARCH}"
 pkg_ngh2="$(find "${LIBS_DIR}" -maxdepth 1 -name 'nghttp2-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${NGH2_DIR}" && mkdir "${NGH2_DIR}"
 tar -xvf "${pkg_ngh2}" --strip-components=1 -C "${NGH2_DIR}"
@@ -142,7 +144,7 @@ popd
 # libiconv
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== libiconv ====================\n\n"
-readonly ICNV_DIR="${BASE_DIR}/libiconv-${MY_MARCH}"
+readonly ICNV_DIR="${BASE_DIR}/libiconv-${MY_ARCH}"
 pkg_icnv="$(find "${LIBS_DIR}" -maxdepth 1 -name 'libiconv-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${ICNV_DIR}" && mkdir "${ICNV_DIR}"
 tar -xvf "${pkg_icnv}" --strip-components=1 -C "${ICNV_DIR}"
@@ -157,7 +159,7 @@ popd
 # libidn2
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== libidn2 ====================\n\n"
-readonly IDN2_DIR="${BASE_DIR}/libidn2-${MY_MARCH}"
+readonly IDN2_DIR="${BASE_DIR}/libidn2-${MY_ARCH}"
 pkg_idn2="$(find "${LIBS_DIR}" -maxdepth 1 -name 'libidn2-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${IDN2_DIR}" && mkdir "${IDN2_DIR}"
 tar -xvf "${pkg_idn2}" --strip-components=1 -C "${IDN2_DIR}"
@@ -172,7 +174,7 @@ popd
 # libgsasl
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== libgsasl ====================\n\n"
-readonly SASL_DIR="${BASE_DIR}/libgsasl-${MY_MARCH}"
+readonly SASL_DIR="${BASE_DIR}/libgsasl-${MY_ARCH}"
 pkg_sasl="$(find "${LIBS_DIR}" -maxdepth 1 -name 'libgsasl-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${SASL_DIR}" && mkdir "${SASL_DIR}"
 tar -xvf "${pkg_sasl}" --strip-components=1 -C "${SASL_DIR}"
@@ -188,19 +190,19 @@ popd
 # libwmain
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== libwmain ====================\n\n"
-readonly LWMN_DIR="${BASE_DIR}/libwmain-${MY_MARCH}"
+readonly LWMN_DIR="${BASE_DIR}/libwmain-${MY_ARCH}"
 pkg_lwmn="$(find "${BASE_DIR}/patch" -maxdepth 1 -name 'libwmain-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${LWMN_DIR}" && mkdir "${LWMN_DIR}"
 tar -xvf "${pkg_lwmn}" --strip-components=1 -C "${LWMN_DIR}"
 pushd "${LWMN_DIR}"
-make
+make MARCH=${MY_MARCH} MTUNE=${MY_MTUNE}
 cp -v libwmain.a "${LIBS_DIR}/lib"
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # cURL
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== cURL ====================\n\n"
-readonly CURL_DIR="${BASE_DIR}/curl-${MY_MARCH}"
+readonly CURL_DIR="${BASE_DIR}/curl-${MY_ARCH}"
 pkg_curl="$(find "${LIBS_DIR}" -maxdepth 1 -name 'curl-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${CURL_DIR}" && mkdir "${CURL_DIR}"
 tar -xvf ${pkg_curl} --strip-components=1 -C "${CURL_DIR}"
@@ -218,7 +220,7 @@ popd
 # Output
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== Output ====================\n\n"
-readonly OUT_DIR="${BASE_DIR}/.bin/${MY_MARCH}"
+readonly OUT_DIR="${BASE_DIR}/.bin/${MY_ARCH}"
 rm -rf "${OUT_DIR}" && mkdir "${OUT_DIR}"
 pushd "${OUT_DIR}"
 cp -vf "${CURL_DIR}/src/curl.exe" curl.exe