Update environment setup scripts

3 files changed, 21 insertions, 21 deletions

diff --git a/env.bat b/env.bat
index d327b2976d..44483bf993 100644
--- a/env.bat
+++ b/env.bat
@@ -1,4 +1,4 @@
 SET SCRIPT_DIR=%~dp0
 SET OPENSSL_STATIC=1
-SET OPENSSL_LIB_DIR=%SCRIPT_DIR%\dist-assets\binaries\windows
-SET OPENSSL_INCLUDE_DIR=%SCRIPT_DIR%\dist-assets\binaries\windows\include
+SET OPENSSL_LIB_DIR=%SCRIPT_DIR%\dist-assets\binaries\x86_64-pc-windows-msvc
+SET OPENSSL_INCLUDE_DIR=%SCRIPT_DIR%\dist-assets\binaries\x86_64-pc-windows-msvc\include
diff --git a/env.ps1 b/env.ps1
index 90cb95e8f6..0f8899e404 100644
--- a/env.ps1
+++ b/env.ps1
@@ -1,5 +1,5 @@
 $SCRIPT_DIR = split-path -parent $MyInvocation.MyCommand.Definition
 
 $env:OPENSSL_STATIC="1"
-$env:OPENSSL_LIB_DIR="$SCRIPT_DIR\dist-assets\binaries\windows"
-$env:OPENSSL_INCLUDE_DIR="$SCRIPT_DIR\dist-assets\binaries\windows\include"
+$env:OPENSSL_LIB_DIR="$SCRIPT_DIR\dist-assets\binaries\x86_64-pc-windows-msvc"
+$env:OPENSSL_INCLUDE_DIR="$SCRIPT_DIR\dist-assets\binaries\x86_64-pc-windows-msvc\include"
diff --git a/env.sh b/env.sh
index 735943788e..62ab1b3132 100755
--- a/env.sh
+++ b/env.sh
@@ -3,43 +3,43 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if [ -n "$1" ]; then
-    PLATFORM="$1"
+    TARGET="$1"
 else
-    PLATFORM=""
+    TARGET=""
 fi
 
-if [ -z "$PLATFORM" ]; then
+if [ -z "$TARGET" ]; then
     case "$(uname -s)" in
       Linux*)
-        PLATFORM="linux"
+        TARGET="x86_64-unknown-linux-gnu"
         ;;
       Darwin*)
-        PLATFORM="macos"
+        TARGET="x86_64-apple-darwin"
         ;;
       MINGW*|MSYS_NT*)
-        PLATFORM="windows"
+        TARGET="x86_64-pc-windows-msvc"
         ;;
     esac
 fi
 
-case "$PLATFORM" in
-  linux)
-    export LIBMNL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/linux"
-    export LIBNFTNL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/linux"
+case "$TARGET" in
+  *android*)
     ;;
-  macos)
-    export MACOSX_DEPLOYMENT_TARGET="10.7"
+  *linux*)
+    export LIBMNL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/$TARGET"
+    export LIBNFTNL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/$TARGET"
     ;;
-  windows)
+  *darwin*)
+    export MACOSX_DEPLOYMENT_TARGET="10.7"
     ;;
-  android*)
+  *windows*)
     ;;
   *)
-    echo "Unknown target platform \"$PLATFORM\"" >&2
+    echo "Unknown target \"$TARGET\"" >&2
     exit 1
     ;;
 esac
 
 export OPENSSL_STATIC="1"
-export OPENSSL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/$PLATFORM"
-export OPENSSL_INCLUDE_DIR="$SCRIPT_DIR/dist-assets/binaries/$PLATFORM/include"
+export OPENSSL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/$TARGET"
+export OPENSSL_INCLUDE_DIR="$SCRIPT_DIR/dist-assets/binaries/$TARGET/include"