mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 08:19:02 +08:00
203383666e
* [llvm] Update port to 15.0.1 The patchset is rebased onto llvmorg-15.0.1, with some significant differences especially around install paths. The NixOS project appears to be midway through a large change to the install path mechanics, for the same purpose as this patchset. When that has landed, it looks like most of these patches can go away. * [llvm] x-add-version for 15.0.1 * [llvm] Add enable-ios feature flag This passes straight through to COMPILER_RT_ENABLE_IOS, which is defaulted to ON in LLVM. This is a problem if your build host doesn't have the iOS SDK installed, such as on vcpkg CI. Co-authored-by: Josh Channings <josh@channings.me.uk>
17 lines
752 B
Diff
17 lines
752 B
Diff
llvm/tools/llvm-config/llvm-config.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
|
|
index 2c6c55f89d38..f2b581559991 100644
|
|
--- a/llvm/tools/llvm-config/llvm-config.cpp
|
|
+++ b/llvm/tools/llvm-config/llvm-config.cpp
|
|
@@ -307,7 +307,7 @@ int main(int argc, char **argv) {
|
|
// bin dir).
|
|
sys::fs::make_absolute(CurrentPath);
|
|
CurrentExecPrefix =
|
|
- sys::path::parent_path(sys::path::parent_path(CurrentPath)).str();
|
|
+ sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str();
|
|
|
|
// Check to see if we are inside a development tree by comparing to possible
|
|
// locations (prefix style or CMake style).
|