mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-10 23:42:18 +00:00
621afe854a
* Integrate patch to fix FTBFS under IA64. * Disable the usage of binutils-gold under armel. It currently fails with: "attempt to map 2752512 bytes at offset 2066666 exceeds size of file; the file may be corrupt"
40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.py
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/clang-format/clang-format.py 2013-07-01 13:31:50.000000000 +0200
|
|
+++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.py 2013-07-01 13:31:50.000000000 +0200
|
|
@@ -23,7 +23,7 @@
|
|
import vim
|
|
|
|
# Change this to the full path if clang-format is not on the path.
|
|
-binary = 'clang-format'
|
|
+binary = 'clang-format-3.4'
|
|
|
|
# Change this to format according to other formatting styles (see
|
|
# clang-format -help)
|
|
Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format-diff.py
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/clang-format/clang-format-diff.py 2013-07-01 13:31:50.000000000 +0200
|
|
+++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format-diff.py 2013-07-01 13:31:50.000000000 +0200
|
|
@@ -28,7 +28,7 @@
|
|
|
|
|
|
# Change this to the full path if clang-format is not on the path.
|
|
-binary = 'clang-format'
|
|
+binary = 'clang-format-3.4'
|
|
|
|
|
|
def getOffsetLength(filename, line_number, line_count):
|
|
Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.el
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/clang-format/clang-format.el 2013-07-01 13:31:50.000000000 +0200
|
|
+++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.el 2013-07-01 13:31:50.000000000 +0200
|
|
@@ -13,7 +13,7 @@
|
|
|
|
;; *Location of the clang-format binary. If it is on your PATH, a full path name
|
|
;; need not be specified.
|
|
-(defvar clang-format-binary "clang-format")
|
|
+(defvar clang-format-binary "clang-format-3.4")
|
|
|
|
(defun clang-format-region ()
|
|
"Use clang-format to format the currently active region."
|