Skip to content

Commit 5dc7033

Browse files
committed
Revert "[lldb] Explicitly use the configuration architecture when building test executables"
This reverts commit 4118522. Causes TestQuoting to fail on Windows.
1 parent 32b6e9a commit 5dc7033

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

lldb/packages/Python/lldbsuite/test/builders/builder.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ def getArchSpec(self, architecture):
9393
Helper function to return the key-value string to specify the architecture
9494
used for the make system.
9595
"""
96-
return ("ARCH=" + architecture) if architecture else ""
96+
arch = architecture if architecture else None
97+
if not arch and configuration.arch:
98+
arch = configuration.arch
99+
100+
return ("ARCH=" + arch) if arch else ""
97101

98102
def getCCSpec(self, compiler):
99103
"""

lldb/packages/Python/lldbsuite/test/lldbtest.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2606,9 +2606,6 @@ def build(
26062606
"""Platform specific way to build the default binaries."""
26072607
module = builder_module()
26082608

2609-
if not architecture and configuration.arch:
2610-
architecture = configuration.arch
2611-
26122609
dictionary = lldbplatformutil.finalize_build_dictionary(dictionary)
26132610
if self.getDebugInfo() is None:
26142611
return self.buildDefault(architecture, compiler, dictionary)

0 commit comments

Comments
 (0)