[Lldb-commits] [PATCH] D38328: Assume git-generated patch files in build scripts

[Phabricator via Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL314366: Change build-llvm.py and build-lldb-llvm-clang's 
patching mechanisms to (authored by jmolenda).

Repository:
  rL LLVM

https://reviews.llvm.org/D38328

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


Index: lldb/trunk/scripts/build-lldb-llvm-clang
===================================================================
--- lldb/trunk/scripts/build-lldb-llvm-clang
+++ lldb/trunk/scripts/build-lldb-llvm-clang
@@ -33,15 +33,15 @@
 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"
 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 "./"
Index: lldb/trunk/scripts/Xcode/build-llvm.py
===================================================================
--- lldb/trunk/scripts/Xcode/build-llvm.py
+++ lldb/trunk/scripts/Xcode/build-llvm.py
@@ -224,7 +224,7 @@
             f, spec['name'] + '.*.diff')]
     for p in patches:
         run_in_directory(["patch",
-                          "-p0",
+                          "-p1",
                           "-i",
                           os.path.join(lldb_source_path(),
                                        'scripts',



Index: lldb/trunk/scripts/build-lldb-llvm-clang
===================================================================
--- lldb/trunk/scripts/build-lldb-llvm-clang
+++ lldb/trunk/scripts/build-lldb-llvm-clang
@@ -33,15 +33,15 @@
 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"
 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 "./"
Index: lldb/trunk/scripts/Xcode/build-llvm.py
===================================================================
--- lldb/trunk/scripts/Xcode/build-llvm.py
+++ lldb/trunk/scripts/Xcode/build-llvm.py
@@ -224,7 +224,7 @@
             f, spec['name'] + '.*.diff')]
     for p in patches:
         run_in_directory(["patch",
-                          "-p0",
+                          "-p1",
                           "-i",
                           os.path.join(lldb_source_path(),
                                        'scripts',

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits