aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorIvan Donchevskii <ivan.donchevskii@qt.io>2018-04-13 14:47:14 +0200
committerIvan Donchevskii <ivan.donchevskii@qt.io>2018-04-13 12:49:45 +0000
commitc3275c935cc470f4fc24c3d63a4396c97e9ba28c (patch)
treec9267c779b09092e61518217bac8abc2bfb1ec55 /dist
parente9c462391ed3526097ca8121cce5cf8c84df1435 (diff)
Clang: Fix paths in clang patch and its number
Change-Id: I27ab7d3c88cf057ad9505f817e2f211d734e23d4 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'dist')
-rw-r--r--dist/clang/patches/240_Link-clang-tools.patch (renamed from dist/clang/patches/220_Link-clang-tools.patch)12
1 files changed, 6 insertions, 6 deletions
diff --git a/dist/clang/patches/220_Link-clang-tools.patch b/dist/clang/patches/240_Link-clang-tools.patch
index c9e0889f33..3a07e0a70a 100644
--- a/dist/clang/patches/220_Link-clang-tools.patch
+++ b/dist/clang/patches/240_Link-clang-tools.patch
@@ -1,7 +1,7 @@
-diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
+diff --git a/tools/clang/tools/driver/CMakeLists.txt b/tools/clang/tools/driver/CMakeLists.txt
index 901b6d62e4..178e7a1882 100644
---- a/tools/driver/CMakeLists.txt
-+++ b/tools/driver/CMakeLists.txt
+--- a/tools/clang/tools/driver/CMakeLists.txt
++++ b/tools/clang/tools/driver/CMakeLists.txt
@@ -43,6 +43,9 @@ target_link_libraries(clang
clangDriver
clangFrontend
@@ -12,10 +12,10 @@ index 901b6d62e4..178e7a1882 100644
)
if(WIN32 AND NOT CYGWIN)
-diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
+diff --git a/tools/clang/tools/driver/driver.cpp b/tools/clang/tools/driver/driver.cpp
index 9f37c428ff..475c5f84c0 100644
---- a/tools/driver/driver.cpp
-+++ b/tools/driver/driver.cpp
+--- a/tools/clang/tools/driver/driver.cpp
++++ b/tools/clang/tools/driver/driver.cpp
@@ -517,3 +517,18 @@ int main(int argc_, const char **argv_) {
// failing command.
return Res;