Author: Raphael Isemann Date: 2020-10-22T18:42:19+02:00 New Revision: 5dc70332d53cc5744aedf72a12d0367988559776
URL: https://github.com/llvm/llvm-project/commit/5dc70332d53cc5744aedf72a12d0367988559776 DIFF: https://github.com/llvm/llvm-project/commit/5dc70332d53cc5744aedf72a12d0367988559776.diff LOG: Revert "[lldb] Explicitly use the configuration architecture when building test executables" This reverts commit 41185226f6d80663b4a1064c6f47581ee567d78d. Causes TestQuoting to fail on Windows. Added: Modified: lldb/packages/Python/lldbsuite/test/builders/builder.py lldb/packages/Python/lldbsuite/test/lldbtest.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py index 6c9584224f4a..fbfa86700e22 100644 --- a/lldb/packages/Python/lldbsuite/test/builders/builder.py +++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py @@ -93,7 +93,11 @@ def getArchSpec(self, architecture): Helper function to return the key-value string to specify the architecture used for the make system. """ - return ("ARCH=" + architecture) if architecture else "" + arch = architecture if architecture else None + if not arch and configuration.arch: + arch = configuration.arch + + return ("ARCH=" + arch) if arch else "" def getCCSpec(self, compiler): """ diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index f469ce86f26e..69da3914f1f2 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -2606,9 +2606,6 @@ def build( """Platform specific way to build the default binaries.""" module = builder_module() - if not architecture and configuration.arch: - architecture = configuration.arch - dictionary = lldbplatformutil.finalize_build_dictionary(dictionary) if self.getDebugInfo() is None: return self.buildDefault(architecture, compiler, dictionary) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
