[Lldb-commits] [lldb] r314366 - Change build-llvm.py and build-lldb-llvm-clang's patching mechanisms to

[Jason Molenda via lldb-commits]

Author: jmolenda
Date: Wed Sep 27 16:44:54 2017
New Revision: 314366

URL: http://llvm.org/viewvc/llvm-project?rev=314366&view=rev
Log:
Change build-llvm.py and build-lldb-llvm-clang's patching mechanisms to
assume git-style diffs.  Committing for Francis Ricci.

Differential Revision: https://reviews.llvm.org/D38328

Modified:
    lldb/trunk/scripts/Xcode/build-llvm.py
    lldb/trunk/scripts/build-lldb-llvm-clang

Modified: lldb/trunk/scripts/Xcode/build-llvm.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Xcode/build-llvm.py?rev=314366&r1=314365&r2=314366&view=diff
==============================================================================
--- lldb/trunk/scripts/Xcode/build-llvm.py (original)
+++ lldb/trunk/scripts/Xcode/build-llvm.py Wed Sep 27 16:44:54 2017
@@ -224,7 +224,7 @@ def apply_patches(spec):
             f, spec['name'] + '.*.diff')]
     for p in patches:
         run_in_directory(["patch",
-                          "-p0",
+                          "-p1",
                           "-i",
                           os.path.join(lldb_source_path(),
                                        'scripts',

Modified: lldb/trunk/scripts/build-lldb-llvm-clang
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-lldb-llvm-clang?rev=314366&r1=314365&r2=314366&view=diff
==============================================================================
--- lldb/trunk/scripts/build-lldb-llvm-clang (original)
+++ lldb/trunk/scripts/build-lldb-llvm-clang Wed Sep 27 16:44:54 2017
@@ -33,7 +33,7 @@ cd ..
 for patch_file in ../scripts/llvm.*.diff
 do
 	echo "Applying patch from '$patch_file'"
-    patch -p0 < "$patch_file"
+    patch -p1 < "$patch_file"
 done
 
 # change directory to "./llvm/tools/clang"
@@ -41,7 +41,7 @@ cd tools/clang
 for patch_file in ../../../scripts/clang.*.diff
 do
 	echo "Applying patch from '$patch_file'"
-    patch -p0 < "$patch_file"
+    patch -p1 < "$patch_file"
 done
 
 # change directory to "./"