Build cxx-common architecture targets when building llvm via vcpkg.js…

…on (#874)
lifting-bits · Dec 31, 2021 · 3c7a392 · 3c7a392
1 parent 6ecebab
commit 3c7a392
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/ports/llvm-12/vcpkg.json b/ports/llvm-12/vcpkg.json
@@ -19,8 +19,9 @@
     "clang",
     "compiler-rt",
     "default-options",
-    "default-targets",
+    "cxx-common-targets",
     "libcxx",
+    "libcxxabi",
     "mlir",
     "tools"
   ],
@@ -62,6 +63,22 @@
         }
       ]
     },
+    "cxx-common-targets": {
+      "description": "Build with cxx-common target set",
+      "dependencies": [
+        {
+          "name": "llvm-12",
+          "default-features": false,
+          "features": [
+            "target-aarch64",
+            "target-arm",
+            "target-nvptx",
+            "target-sparc",
+            "target-x86"
+          ]
+        }
+      ]
+    },
     "default-targets": {
       "description": "Build with platform-specific default targets.",
       "dependencies": [

diff --git a/ports/llvm-13/vcpkg.json b/ports/llvm-13/vcpkg.json
@@ -19,8 +19,9 @@
     "clang",
     "compiler-rt",
     "default-options",
-    "default-targets",
+    "cxx-common-targets",
     "libcxx",
+    "libcxxabi",
     "mlir",
     "tools"
   ],
@@ -62,6 +63,22 @@
         }
       ]
     },
+    "cxx-common-targets": {
+      "description": "Build with cxx-common target set",
+      "dependencies": [
+        {
+          "name": "llvm-13",
+          "default-features": false,
+          "features": [
+            "target-aarch64",
+            "target-arm",
+            "target-nvptx",
+            "target-sparc",
+            "target-x86"
+          ]
+        }
+      ]
+    },
     "default-targets": {
       "description": "Build with platform-specific default targets.",
       "dependencies": [