mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 02:51:39 +08:00
d9b179fd46
* [llvm] install tools in tools/llvm * remove the giant commented out block of code * update port-version * hopefully fix the port? There are still some issues, namely that the python scripts and DLLs that are copied into `tools/llvm` are not considered to be "installed by llvm", and thus are not removed when llvm is removed * format! * apparently REGEX REPLACE fails if a thing doesn't match * fix LLVM_REMOVE_EXTENSION_REGEX on windows * actually read the cmake regex docs... * fix the name of the variable * turns out CMAKE_MATCH_1 is the one I want * need to update VERSION for new policy * stop removing debug/bin * fix faulty merge
15 lines
736 B
Diff
15 lines
736 B
Diff
diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
|
|
index 53ba24efc00..0badcafe000 100644
|
|
--- a/llvm/tools/llvm-config/llvm-config.cpp
|
|
+++ b/llvm/tools/llvm-config/llvm-config.cpp
|
|
@@ -304,8 +304,8 @@ int main(int argc, char **argv) {
|
|
// Create an absolute path, and pop up one directory (we expect to be inside a
|
|
// 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).
|