optimized

Signed-off-by: leleliu008 <leleliu008@gmail.com>
leleliu008 · Feb 14, 2024 · e424b75 · e424b75
1 parent 4afb6ae
commit e424b75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml
@@ -58,12 +58,8 @@ jobs:
 
       - run: ./ndk-pkg setup
 
-      # https://github.com/microsoft/WSL/issues/8681
-      - run: patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 ~/.uppm/installed/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/clang
-
       - run: ./ndk-pkg sysinfo
 
-
       - run: ./ndk-pkg integrate zsh
 
       - run: ./ndk-pkg update

diff --git a/ndk-pkg b/ndk-pkg
@@ -8008,6 +8008,12 @@ ndkinfo() {
             ANDROID_NDK_IS_INSTALLED_VIA_UPPM=1
             warn "Android NDK not found, it will be installed via uppm."
             "$UPPM" install  "$UPPM_PACKAGE_NAME_NDK"
+
+            # https://github.com/microsoft/WSL/issues/8681
+            # https://github.com/microsoft/WSL/issues/4071
+            if [ "$NATIVE_OS_KIND" = linux ] && grep -q -i Microsoft /proc/version ; then
+                patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 ~/.uppm/installed/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/clang
+            fi
         fi
 
         ANDROID_NDK_HOME="$("$UPPM" info "$UPPM_PACKAGE_NAME_NDK" installed-dir)"