[zorg] r178258 - Change the installation of clang-tools-extra into clang.src from a symlink to a copy.

Michael Gottesman mgottesman at apple.com
Thu Mar 28 11:37:21 PDT 2013


Author: mgottesman
Date: Thu Mar 28 13:37:21 2013
New Revision: 178258

URL: http://llvm.org/viewvc/llvm-project?rev=178258&view=rev
Log:
Change the installation of clang-tools-extra into clang.src from a symlink to a copy.

For some reason the symlink is causing the build process to fail. I put in a TODO
to investigate this and changed the link to a copy (which is fine since
clang-tools-extra is small and will still yield the same effect).

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=178258&r1=178257&r2=178258&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Thu Mar 28 13:37:21 2013
@@ -699,12 +699,13 @@ def phasedClang(config_options, is_boots
               command=['ln', '-sfv', '../../compiler-rt.src', 'compiler-rt'],
               haltOnFailure=True, workdir='llvm/projects',
               description=['ln', 'compiler-rt sources']))
-    # Create a symlink in clang for clang-tools-extra.
+    # TODO: We used to use a symlink here but it seems to not work. I am trying
+    # to get this builder to work so I am just going to copy it instead.
     f.addStep(buildbot.steps.shell.ShellCommand(
-              name='ln.clang-tools-extra-sources',
-              command=['ln', '-sfv', '../../clang-tools-extra.src', 'extra'],
+              name='cp.clang-tools-extra-sources',
+              command=['cp', '-fv', '../../clang-tools-extra.src', 'extra'],
               haltOnFailure=True, workdir='clang.src/tools',
-              description=['ln', 'clang-tools-extra sources']))    
+              description=['cp', 'clang-tools-extra sources']))    
     # Checkout the supplemental 'debuginfo-tests' repository.
     debuginfo_url = 'http://llvm.org/svn/llvm-project/debuginfo-tests/trunk'
     f.addStep(HostSVN(name='pull.debug-info tests', mode='incremental',





More information about the llvm-commits mailing list