↩ revert: rvt externalCommand.

Shuery-Shuai · Sep 5, 2023 · 71280fe · 71280fe
1 parent 27b704d
commit 71280fe
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/repos/repos.polaris.json b/repos/repos.polaris.json
@@ -14,23 +14,28 @@
         "branch": "master",
         "name": "prelude-clang",
         "binPath": ["bin"]
-      },
-      {
-        "repo": "https://github.com/PixelExperience/prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9",
-        "branch": "thirteen",
-        "name": "gcc",
-        "binPath": ["bin"]
       }
     ],
     "ccache": true,
     "params": {
       "ARCH": "arm64",
       "CC": "prelude-clang/bin/clang",
       "externalCommand": {
-        "CLANG_TRIPLE": "prelude-clang/bin/aarch64-linux-gnu-",
-        "CROSS_COMPILE": "gcc/bin/aarch64-linux-androidkernel-",
-        "CROSS_COMPILE_ARM32 ": "prelude-clang/bin/arm-linux-gnueabi-",
-        "LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN": "gcc/bin"
+        "externalCommand": {
+          "CROSS_COMPILE": "prelude-clang/bin/aarch64-linux-gnu-",
+          "CROSS_COMPILE_ARM32": "prelude-clang/bin/arm-linux-gnueabi-",
+          "LD": "prelude-clang/bin/ld.lld",
+          "AR": "prelude-clang/bin/llvm-ar",
+          "NM": "prelude-clang/bin/llvm-nm",
+          "OBJCOPY": "prelude-clang/bin/llvm-objcopy",
+          "OBJDUMP": "prelude-clang/bin/llvm-objdump",
+          "READELF": "prelude-clang/bin/llvm-readelf",
+          "OBJSIZE": "prelude-clang/bin/llvm-size",
+          "STRIP": "prelude-clang/bin/llvm-strip",
+          "LDGOLD": "prelude-clang/bin/aarch64-linux-gnu-ld.gold",
+          "LLVM_AR": "prelude-clang/bin/llvm-ar",
+          "LLVM_DIS": "prelude-clang/bin/llvm-dis"
+        }
       }
     },
     "AnyKernel3": {
@@ -74,10 +79,10 @@
       "ARCH": "arm64",
       "CC": "clang/bin/clang",
       "externalCommand": {
-        "CLANG_TRIPLE": "gcc/bin/aarch64-linux-gnu-",
-        "CROSS_COMPILE": "gcc/bin/aarch64-linux-androidkernel-",
-        "CROSS_COMPILE_ARM32 ": "gcc-32/bin/arm-linux-androidkernel-",
-        "LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN" :"gcc/bin"
+        "CROSS_COMPILE": "aarch64-linux-gnu-",
+        "CROSS_COMPILE_ARM32": "arm-linux-gnueabi-",
+        "CROSS_COMPILE_COMPAT": "arm-linux-gnueabi-",
+        "CLANG_TRIPLE": "aarch64-linux-gnu-"
       }
     },
     "AnyKernel3": {