sas created this revision.
sas added reviewers: tfiala, clayborg.
sas added a subscriber: lldb-commits.

This is already done when building for linux with the CMake build
system. This functionality disappeared recently when some of the build
scripts used by the xcode build system changed.

http://reviews.llvm.org/D22233

Files:
  scripts/Xcode/build-llvm.py

Index: scripts/Xcode/build-llvm.py
===================================================================
--- scripts/Xcode/build-llvm.py
+++ scripts/Xcode/build-llvm.py
@@ -2,6 +2,7 @@
 
 import errno
 import hashlib
+import fnmatch
 import os
 import platform
 import subprocess
@@ -166,9 +167,16 @@
 
 #### CHECKING OUT AND BUILDING LLVM ####
 
+def apply_patches(spec):
+    files = os.listdir(os.path.join(lldb_source_path(), 'scripts'))
+    patches = [f for f in files if fnmatch.fnmatch(f, spec['name'] + 
'.*.diff')]
+    for p in patches:
+        run_in_directory(["patch", "-p0", "-i", 
os.path.join(lldb_source_path(), 'scripts', p)], spec['root'])
+
 def check_out_if_needed(spec):
     if not os.path.isdir(spec['root']):
         vcs(spec).check_out()
+        apply_patches(spec)
 
 def all_check_out_if_needed ():
     map (check_out_if_needed, XCODE_REPOSITORIES())


Index: scripts/Xcode/build-llvm.py
===================================================================
--- scripts/Xcode/build-llvm.py
+++ scripts/Xcode/build-llvm.py
@@ -2,6 +2,7 @@
 
 import errno
 import hashlib
+import fnmatch
 import os
 import platform
 import subprocess
@@ -166,9 +167,16 @@
 
 #### CHECKING OUT AND BUILDING LLVM ####
 
+def apply_patches(spec):
+    files = os.listdir(os.path.join(lldb_source_path(), 'scripts'))
+    patches = [f for f in files if fnmatch.fnmatch(f, spec['name'] + '.*.diff')]
+    for p in patches:
+        run_in_directory(["patch", "-p0", "-i", os.path.join(lldb_source_path(), 'scripts', p)], spec['root'])
+
 def check_out_if_needed(spec):
     if not os.path.isdir(spec['root']):
         vcs(spec).check_out()
+        apply_patches(spec)
 
 def all_check_out_if_needed ():
     map (check_out_if_needed, XCODE_REPOSITORIES())
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to