[Lldb-commits] [lldb] [lldb][test] Improve toolchain detection in Makefile.rules (PR #102185)
Vladislav Dzhidzhoev via lldb-commits
lldb-commits at lists.llvm.org
Thu Aug 15 12:39:39 PDT 2024
https://github.com/dzhidzhoev updated https://github.com/llvm/llvm-project/pull/102185
>From 5130b2af8c2a274d73a9d90a4a71d77d85ac0973 Mon Sep 17 00:00:00 2001
From: Vladislav Dzhidzhoev <vdzhidzhoev at accesssoftek.com>
Date: Sat, 27 Jul 2024 02:39:32 +0200
Subject: [PATCH] [lldb][test] Improve toolchain detection in Makefile.rules
This fix is based on a problem with cxx_compiler and cxx_linker macros
on Windows.
There was an issue with compiler detection in paths containing "icc". In
such case, Makefile.rules thought it was provided with icc compiler.
To solve that, utilities detection has been rewritten in Python.
The last element of compiler's path is separated, taking into account
platform path delimiter, and compiler type is extracted, with regard
of possible cross-toolchain prefix. Paths for additional tools,
like OBJCOPY, are initialized with tools built with LLVM if USE_LLVM_TOOLS
is on, to achieve better portability for Windows.
Quotes from paths are removed in Makefile.rules, that may be added when
arguments are passed from Python to make.
---
.../Python/lldbsuite/test/builders/builder.py | 101 +++++++++++++++++-
.../Python/lldbsuite/test/make/Makefile.rules | 91 +++++-----------
.../breakpoint/breakpoint_ids/Makefile | 2 +-
.../breakpoint/breakpoint_locations/Makefile | 2 +-
.../consecutive_breakpoints/Makefile | 2 +-
.../functionalities/breakpoint/cpp/Makefile | 2 +-
.../dummy_target_breakpoints/Makefile | 2 +-
.../require_hw_breakpoints/Makefile | 2 +-
.../breakpoint/step_over_breakpoint/Makefile | 2 +-
.../thread_plan_user_breakpoint/Makefile | 2 +-
.../ObjCDataFormatterTestCase.py | 4 +-
.../TestNSDictionarySynthetic.py | 4 +-
.../nssetsynth/TestNSSetSynthetic.py | 4 +-
.../poarray/TestPrintObjectArray.py | 4 +-
.../functionalities/inline-stepping/Makefile | 2 +-
.../postmortem/minidump-new/makefile.txt | 1 +
.../lang/objc/orderedset/TestOrderedSet.py | 4 +-
.../TestObjCSingleEntryDictionary.py | 4 +-
lldb/test/API/macosx/macCatalyst/Makefile | 1 +
.../macCatalystAppMacOSFramework/Makefile | 1 +
.../macosx/simulator/TestSimulatorPlatform.py | 4 +-
.../API/python_api/frame/inlines/Makefile | 2 +-
.../lldb-server/TestAppleSimulatorOSType.py | 4 +-
23 files changed, 154 insertions(+), 93 deletions(-)
diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py
index 4ea9a86c1d5fc9..e6c2c99cac4948 100644
--- a/lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -1,10 +1,12 @@
import os
+import pathlib
import platform
import subprocess
import sys
import itertools
import lldbsuite.test.lldbtest as lldbtest
+import lldbsuite.test.lldbplatformutil as lldbplatformutil
import lldbsuite.test.lldbutil as lldbutil
from lldbsuite.test import configuration
from lldbsuite.test_event import build_exception
@@ -96,16 +98,107 @@ def getArchSpec(self, architecture):
"""
return ["ARCH=" + architecture] if architecture else []
- def getCCSpec(self, compiler):
+ def getToolchainSpec(self, compiler):
"""
- Helper function to return the key-value string to specify the compiler
+ Helper function to return the key-value strings to specify the toolchain
used for the make system.
"""
cc = compiler if compiler else None
if not cc and configuration.compiler:
cc = configuration.compiler
+
if cc:
- return ['CC="%s"' % cc]
+ exe_ext = ""
+ if lldbplatformutil.getHostPlatform() == "windows":
+ exe_ext = ".exe"
+
+ cc = cc.strip()
+ cc_path = pathlib.Path(cc)
+ cc = cc_path.as_posix()
+
+ # We can get CC compiler string in the following formats:
+ # [<tool>] <compiler> - such as 'xrun clang', 'xrun /usr/bin/clang' & etc
+ #
+ # Where <compiler> could contain the following parts:
+ # <simple-name>[.<exe-ext>] - sucn as 'clang', 'clang.exe' ('clamg-cl.exe'?)
+ # <target-triple>-<simple-name>[.<exe-ext>] - such as 'armv7-linux-gnueabi-gcc'
+ # <path>/<simple-name>[.<exe-ext>] - such as '/usr/bin/clang', 'c:\path\to\compiler\clang,exe'
+ # <path>/<target-triple>-<simple-name>[.<exe-ext>] - such as '/usr/bin/clang', 'c:\path\to\compiler\clang,exe'
+
+ cc_ext = cc_path.suffix
+ # Compiler name without extension
+ cc_name = cc_path.stem.split(" ")[-1]
+
+ # A kind of compiler (canonical name): clang, gcc, cc & etc.
+ cc_type = cc_name
+ # A triple prefix of compiler name: <armv7-none-linux-gnu->gcc
+ cc_prefix = ""
+ if not "clang-cl" in cc_name and not "llvm-gcc" in cc_name:
+ cc_name_parts = cc_name.split("-")
+ cc_type = cc_name_parts[-1]
+ if len(cc_name_parts) > 1:
+ cc_prefix = "-".join(cc_name_parts[:-1]) + "-"
+
+ # A kind of C++ compiler.
+ cxx_types = {
+ "icc": "icpc",
+ "llvm-gcc": "llvm-g++",
+ "gcc": "g++",
+ "cc": "c++",
+ "clang": "clang++",
+ }
+ cxx_type = cxx_types.get(cc_type, cc_type)
+
+ cc_dir = cc_path.parent
+
+ def getLlvmUtil(util_name):
+ llvm_tools_dir = os.getenv("LLVM_TOOLS_DIR", cc_dir.as_posix())
+ return llvm_tools_dir + "/" + util_name + exe_ext
+
+ def getToolchainUtil(util_name):
+ return (cc_dir / (cc_prefix + util_name + cc_ext)).as_posix()
+
+ cxx = getToolchainUtil(cxx_type)
+
+ util_names = {
+ "OBJCOPY": "objcopy",
+ "STRIP": "objcopy",
+ "ARCHIVER": "ar",
+ }
+ utils = []
+
+ # Note: LLVM_AR is currently required by API TestBSDArchives.py tests.
+ # Assembly a full path to llvm-ar for given LLVM_TOOLS_DIR;
+ # otherwise assume we have llvm-ar at the same place where is CC specified.
+ if not os.getenv("LLVM_AR"):
+ llvm_ar = getLlvmUtil("llvm-ar")
+ utils.extend(['LLVM_AR="%s"' % llvm_ar])
+
+ if not lldbplatformutil.platformIsDarwin():
+ if os.getenv("USE_LLVM_TOOLS"):
+ # Use the llvm project tool instead of the system defaults.
+ # Note: do not override explicity specified tool from the cmd line.
+ for var, name in util_names.items():
+ utils.append('%s="%s"' % (var, getLlvmUtil("llvm-" + name)))
+ utils.extend(['AR="%s"' % llvm_ar])
+ elif cc_type in ["clang", "cc", "gcc"]:
+ util_paths = {}
+ # Assembly a toolchain side tool cmd based on passed CC.
+ for var, name in util_names.items():
+ if not os.getenv(var):
+ util_paths[var] = getToolchainUtil(name)
+ utils.append('%s="%s"' % (var, util_paths[var]))
+ else:
+ util_paths[var] = os.getenv(var)
+ utils.extend(['AR="%s"' % util_paths["ARCHIVER"]])
+ else:
+ utils.extend(['AR="%slibtool"' % os.getenv("CROSS_COMPILE", "")])
+
+ return [
+ 'CC="%s"' % cc,
+ 'CCC="%s"' % cc_type,
+ 'CXX="%s"' % cxx,
+ ] + utils
return []
def getSDKRootSpec(self):
@@ -178,7 +271,7 @@ def getBuildCommand(
make_targets,
self.getArchCFlags(architecture),
self.getArchSpec(architecture),
- self.getCCSpec(compiler),
+ self.getToolchainSpec(compiler),
self.getExtraMakeArgs(),
self.getSDKRootSpec(),
self.getModuleCacheSpec(),
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 629ccee32e8404..9d625817761edc 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -102,15 +102,32 @@ endif
# If you change the defaults of CC, be sure to also change it in the file
# test/builders/builder_base.py, which provides a Python way to return the
# value of the make variable CC -- getCompiler().
-#
-# See also these functions:
-# o cxx_compiler
-# o cxx_linker
#----------------------------------------------------------------------
ifeq "$(CC)" ""
$(error "C compiler is not specified. Please run tests through lldb-dotest or lit")
endif
+# Remove all " and ' characters from the path. Also remove surrounding space chars.
+cstrip = $(strip $(subst ",,$(subst ',,$(1))))
+override CC := $(call cstrip,$(CC))
+override CCC := $(call cstrip,$(CCC))
+override CXX := $(call cstrip,$(CXX))
+# Always override the linker. Assign already normalized CC.
+override LD := $(call cstrip,$(CC))
+# A kind of linker. It always gets retrieved from CC.
+override LDC := $(call cstrip,$(CCC))
+override OBJCOPY := $(call cstrip,$(OBJCOPY))
+override STRIP := $(call cstrip,$(STRIP))
+override ARCHIVER := $(call cstrip,$(ARCHIVER))
+override AR := $(call cstrip,$(AR))
+override LLVM_AR := $(call cstrip,$(LLVM_AR))
+
+ifeq "$(HOST_OS)" "Windows_NT"
+ # This function enframes the full path with the platform specific quotes. This is necessary to run the c++ executable
+ # properly under 'sh' on Windows host (prevent the path breakage because of Windows style path separators).
+ override CXX := $(QUOTE)$(CXX)$(QUOTE)
+endif
+
#----------------------------------------------------------------------
# Handle SDKROOT for the cross platform builds.
#----------------------------------------------------------------------
@@ -147,10 +164,8 @@ ifeq "$(OS)" "Darwin"
DS := $(DSYMUTIL)
DSFLAGS := $(DSFLAGS_EXTRAS)
DSYM = $(EXE).dSYM
- AR := $(CROSS_COMPILE)libtool
ARFLAGS := -static -o
else
- AR := $(CROSS_COMPILE)ar
# On non-Apple platforms, -arch becomes -m
ARCHFLAG := -m
@@ -207,7 +222,7 @@ endif
LIMIT_DEBUG_INFO_FLAGS =
NO_LIMIT_DEBUG_INFO_FLAGS =
MODULE_DEBUG_INFO_FLAGS =
-ifneq (,$(findstring clang,$(CC)))
+ifeq ($(CCC), clang)
LIMIT_DEBUG_INFO_FLAGS += -flimit-debug-info
NO_LIMIT_DEBUG_INFO_FLAGS += -fno-limit-debug-info
MODULE_DEBUG_INFO_FLAGS += -gmodules
@@ -273,7 +288,6 @@ endif
CFLAGS += $(CFLAGS_EXTRAS)
CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS)
-LD = $(CC)
# Copy common options to the linker flags (dwarf, arch. & etc).
# Note: we get some 'garbage' options for linker here (such as -I, --isystem & etc).
LDFLAGS += $(CFLAGS)
@@ -306,50 +320,6 @@ ifneq "$(DYLIB_NAME)" ""
endif
endif
-# Function that returns the counterpart C++ compiler, given $(CC) as arg.
-cxx_compiler_notdir = $(if $(findstring icc,$(1)), \
- $(subst icc,icpc,$(1)), \
- $(if $(findstring llvm-gcc,$(1)), \
- $(subst llvm-gcc,llvm-g++,$(1)), \
- $(if $(findstring gcc,$(1)), \
- $(subst gcc,g++,$(1)), \
- $(subst cc,c++,$(1)))))
-cxx_compiler = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_compiler_notdir,$(notdir $(1)))),$(call cxx_compiler_notdir,$(1)))
-
-# Function that returns the C++ linker, given $(CC) as arg.
-cxx_linker_notdir = $(if $(findstring icc,$(1)), \
- $(subst icc,icpc,$(1)), \
- $(if $(findstring llvm-gcc,$(1)), \
- $(subst llvm-gcc,llvm-g++,$(1)), \
- $(if $(findstring gcc,$(1)), \
- $(subst gcc,g++,$(1)), \
- $(subst cc,c++,$(1)))))
-cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(1)))
-
-ifneq "$(OS)" "Darwin"
- CLANG_OR_GCC := $(strip $(if $(findstring clang,$(CC)), \
- $(findstring clang,$(CC)), \
- $(if $(findstring gcc,$(CC)), \
- $(findstring gcc,$(CC)), \
- cc)))
-
- CC_LASTWORD := $(strip $(lastword $(subst -, ,$(CC))))
-
- replace_with = $(strip $(if $(findstring $(3),$(CC_LASTWORD)), \
- $(subst $(3),$(1),$(2)), \
- $(subst $(3),$(1),$(subst -$(CC_LASTWORD),,$(2)))))
-
- ifeq "$(notdir $(CC))" "$(CC)"
- replace_cc_with = $(call replace_with,$(1),$(CC),$(CLANG_OR_GCC))
- else
- replace_cc_with = $(join $(dir $(CC)),$(call replace_with,$(1),$(notdir $(CC)),$(CLANG_OR_GCC)))
- endif
-
- OBJCOPY ?= $(call replace_cc_with,objcopy)
- ARCHIVER ?= $(call replace_cc_with,ar)
- override AR = $(ARCHIVER)
-endif
-
ifdef PIE
LDFLAGS += -pie
endif
@@ -358,7 +328,7 @@ endif
# Windows specific options
#----------------------------------------------------------------------
ifeq "$(OS)" "Windows_NT"
- ifneq (,$(findstring clang,$(CC)))
+ ifeq ($(CCC), clang)
# Clang for Windows doesn't support C++ Exceptions
CXXFLAGS += -fno-exceptions
CXXFLAGS += -D_HAS_EXCEPTIONS=0
@@ -403,7 +373,7 @@ endif
ifeq (1,$(USE_LIBSTDCPP))
# Clang requires an extra flag: -stdlib=libstdc++
- ifneq (,$(findstring clang,$(CC)))
+ ifeq ($(CCC), clang)
# Force clang looking for the gcc's headers at specific rootfs folder.
CXXFLAGS += -stdlib=libstdc++ $(GCC_TOOLCHAIN_FLAGS)
LDFLAGS += -stdlib=libstdc++ $(GCC_TOOLCHAIN_FLAGS)
@@ -441,7 +411,7 @@ ifeq (1, $(USE_SYSTEM_STDLIB))
CXXFLAGS += -nostdlib++ -nostdinc++ -cxx-isystem $(SDKROOT)/usr/include/c++/v1
LDFLAGS += -L$(SDKROOT)/usr/lib -Wl,-rpath,$(SDKROOT)/usr/lib -lc++
else
- ifneq (,$(findstring clang,$(CC)))
+ ifeq ($(CCC), clang)
# Force clang looking for the gcc's headers at specific rootfs folder.
CXXFLAGS += $(GCC_TOOLCHAIN_FLAGS)
LDFLAGS += $(GCC_TOOLCHAIN_FLAGS)
@@ -468,8 +438,6 @@ DYLIB_OBJECTS +=$(strip $(DYLIB_C_SOURCES:.c=.o))
DYLIB_OBJECTS +=$(strip $(DYLIB_OBJC_SOURCES:.m=.o))
ifneq "$(strip $(DYLIB_CXX_SOURCES))" ""
DYLIB_OBJECTS +=$(strip $(patsubst %.mm, %.o, $(DYLIB_CXX_SOURCES:.cpp=.o)))
- CXX = $(call cxx_compiler,$(CC))
- LD = $(call cxx_linker,$(CC))
endif
#----------------------------------------------------------------------
@@ -492,8 +460,6 @@ endif
#----------------------------------------------------------------------
ifneq "$(strip $(CXX_SOURCES))" ""
OBJECTS +=$(strip $(CXX_SOURCES:.cpp=.o))
- CXX = $(call cxx_compiler,$(CC))
- LD = $(call cxx_linker,$(CC))
endif
#----------------------------------------------------------------------
@@ -509,19 +475,18 @@ endif
#----------------------------------------------------------------------
ifneq "$(strip $(OBJCXX_SOURCES))" ""
OBJECTS +=$(strip $(OBJCXX_SOURCES:.mm=.o))
- CXX = $(call cxx_compiler,$(CC))
- LD = $(call cxx_linker,$(CC))
ifeq "$(findstring lobjc,$(LDFLAGS))" ""
LDFLAGS +=-lobjc
endif
endif
-ifeq ($(findstring clang, $(CXX)), clang)
+ifeq ($(CCC), clang)
CXXFLAGS += --driver-mode=g++
endif
ifneq "$(CXX)" ""
- ifeq ($(findstring clang, $(LD)), clang)
+ # Specify the driver mode parameter if we use clang as the linker.
+ ifeq ($(LDC), clang)
LDFLAGS += --driver-mode=g++
endif
endif
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/Makefile
index 2c00681fa22804..b1c02b64971dc1 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/Makefile
@@ -1,6 +1,6 @@
CXX_SOURCES := main.cpp
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CXXFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/Makefile
index 9645fd9cc8dfbc..4e16ab79ad53a1 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/Makefile
@@ -1,6 +1,6 @@
C_SOURCES := main.c
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/Makefile
index 2c00681fa22804..b1c02b64971dc1 100644
--- a/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/Makefile
@@ -1,6 +1,6 @@
CXX_SOURCES := main.cpp
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CXXFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/breakpoint/cpp/Makefile b/lldb/test/API/functionalities/breakpoint/cpp/Makefile
index 66108b79e7fe0b..77435bfadab82f 100644
--- a/lldb/test/API/functionalities/breakpoint/cpp/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/cpp/Makefile
@@ -1,7 +1,7 @@
CXX_SOURCES := main.cpp
CXXFLAGS_EXTRAS := -std=c++14
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CXXFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/Makefile
index 9645fd9cc8dfbc..4e16ab79ad53a1 100644
--- a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/Makefile
@@ -1,6 +1,6 @@
C_SOURCES := main.c
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/Makefile
index 9645fd9cc8dfbc..4e16ab79ad53a1 100644
--- a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/Makefile
@@ -1,6 +1,6 @@
C_SOURCES := main.c
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/Makefile b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/Makefile
index 2c00681fa22804..b1c02b64971dc1 100644
--- a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/Makefile
@@ -1,6 +1,6 @@
CXX_SOURCES := main.cpp
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CXXFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/Makefile b/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/Makefile
index 2c00681fa22804..b1c02b64971dc1 100644
--- a/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/Makefile
+++ b/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/Makefile
@@ -1,6 +1,6 @@
CXX_SOURCES := main.cpp
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CXXFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py
index a0d6802b3a506a..c1cd9556c5ef3f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py
@@ -16,12 +16,12 @@ def appkit_tester_impl(self, commands, use_constant_classes):
self.build()
else:
disable_constant_classes = {
- "CC": "xcrun clang", # FIXME: Remove when flags are available upstream.
"CFLAGS_EXTRAS": "-fno-constant-nsnumber-literals "
+ "-fno-constant-nsarray-literals "
+ "-fno-constant-nsdictionary-literals",
}
- self.build(dictionary=disable_constant_classes)
+ # FIXME: Remove compiler when flags are available upstream.
+ self.build(dictionary=disable_constant_classes, compiler="xcrun clang")
self.appkit_common_data_formatters_command()
commands()
diff --git a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
index 9ac41d67eb9ab3..e1d7e42bdd1a99 100644
--- a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
@@ -26,12 +26,12 @@ def test_rdar11988289_with_run_command(self):
def test_rdar11988289_with_run_command_no_const(self):
"""Test that NSDictionary reports its synthetic children properly."""
disable_constant_classes = {
- "CC": "xcrun clang", # FIXME: Remove when flags are available upstream.
"CFLAGS_EXTRAS": "-fno-constant-nsnumber-literals "
+ "-fno-constant-nsarray-literals "
+ "-fno-constant-nsdictionary-literals",
}
- self.build(dictionary=disable_constant_classes)
+ # FIXME: Remove when flags are available upstream.
+ self.build(dictionary=disable_constant_classes, compiler="xcrun clang")
self.run_tests()
def run_tests(self):
diff --git a/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py b/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
index 053ec0ee9757e0..1037e75c17eb34 100644
--- a/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
@@ -26,12 +26,12 @@ def test_rdar12529957_with_run_command(self):
def test_rdar12529957_with_run_command_no_const(self):
"""Test that NSSet reports its synthetic children properly."""
disable_constant_classes = {
- "CC": "xcrun clang", # FIXME: Remove when flags are available upstream.
"CFLAGS_EXTRAS": "-fno-constant-nsnumber-literals "
+ "-fno-constant-nsarray-literals "
+ "-fno-constant-nsdictionary-literals",
}
- self.build(dictionary=disable_constant_classes)
+ # FIXME: Remove compiler when flags are available upstream.
+ self.build(dictionary=disable_constant_classes, compiler="xcrun clang")
self.run_tests()
def run_tests(self):
diff --git a/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py b/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py
index fff37829cd20dc..db86f48f8ec1fe 100644
--- a/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py
+++ b/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py
@@ -20,13 +20,13 @@ def test_print_array(self):
def test_print_array_no_const(self):
"""Test that expr -O -Z works"""
disable_constant_classes = {
- "CC": "xcrun clang", # FIXME: Remove when flags are available upstream.
"USE_SYSTEM_STDLIB": "1", # See above.
"CFLAGS_EXTRAS": "-fno-constant-nsnumber-literals "
+ "-fno-constant-nsarray-literals "
+ "-fno-constant-nsdictionary-literals",
}
- self.build(dictionary=disable_constant_classes)
+ # FIXME: Remove compiler when flags are available upstream.
+ self.build(dictionary=disable_constant_classes, compiler="xcrun clang")
self.printarray_data_formatter_commands()
def setUp(self):
diff --git a/lldb/test/API/functionalities/inline-stepping/Makefile b/lldb/test/API/functionalities/inline-stepping/Makefile
index 362b89d7f995b3..61f65c489ffec1 100644
--- a/lldb/test/API/functionalities/inline-stepping/Makefile
+++ b/lldb/test/API/functionalities/inline-stepping/Makefile
@@ -1,6 +1,6 @@
CXX_SOURCES := calling.cpp
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CXXFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/functionalities/postmortem/minidump-new/makefile.txt b/lldb/test/API/functionalities/postmortem/minidump-new/makefile.txt
index 7096efabdcfe1e..980a17d07c3089 100644
--- a/lldb/test/API/functionalities/postmortem/minidump-new/makefile.txt
+++ b/lldb/test/API/functionalities/postmortem/minidump-new/makefile.txt
@@ -19,6 +19,7 @@
# to generate a Minidump when the binary crashes/requests such.
#
CC=g++
+CCC=gcc
FLAGS=-g --std=c++11
INCLUDE=-I$HOME/breakpad/src/src/
LINK=-L. -lbreakpad -lpthread -nostdlib -lc -lstdc++ -lgcc_s -fno-exceptions
diff --git a/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py b/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py
index 14bfc322979b37..a7d6d9d155efca 100644
--- a/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py
+++ b/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py
@@ -12,12 +12,12 @@ def test_ordered_set(self):
@skipUnlessDarwin
def test_ordered_set_no_const(self):
disable_constant_classes = {
- "CC": "xcrun clang", # FIXME: Remove when flags are available upstream.
"CFLAGS_EXTRAS": "-fno-constant-nsnumber-literals "
+ "-fno-constant-nsarray-literals "
+ "-fno-constant-nsdictionary-literals",
}
- self.build(dictionary=disable_constant_classes)
+ # FIXME: Remove when flags are available upstream.
+ self.build(dictionary=disable_constant_classes, compiler="xcrun clang")
self.run_tests()
def run_tests(self):
diff --git a/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py b/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
index 68c0af76b8e3b8..8debe731dfe1af 100644
--- a/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
+++ b/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
@@ -28,12 +28,12 @@ def test_single_entry_dict(self):
) # bug in NSDictionary formatting on watchos
def test_single_entry_dict_no_const(self):
disable_constant_classes = {
- "CC": "xcrun clang", # FIXME: Remove when flags are available upstream.
"CFLAGS_EXTRAS": "-fno-constant-nsnumber-literals "
+ "-fno-constant-nsarray-literals "
+ "-fno-constant-nsdictionary-literals",
}
- self.build(dictionary=disable_constant_classes)
+ # FIXME: Remove compiler when flags are available upstream.
+ self.build(dictionary=disable_constant_classes, compiler="xcrun clang")
self.run_tests()
def run_tests(self):
diff --git a/lldb/test/API/macosx/macCatalyst/Makefile b/lldb/test/API/macosx/macCatalyst/Makefile
index 3f084968a2d57b..dd64a7b0682a8c 100644
--- a/lldb/test/API/macosx/macCatalyst/Makefile
+++ b/lldb/test/API/macosx/macCatalyst/Makefile
@@ -7,6 +7,7 @@ USE_SYSTEM_STDLIB := 1
# FIXME: rdar://problem/54986190
# There is a Clang driver change missing on llvm.org.
+override CCC=clang
override CC=xcrun clang
include Makefile.rules
diff --git a/lldb/test/API/macosx/macCatalystAppMacOSFramework/Makefile b/lldb/test/API/macosx/macCatalystAppMacOSFramework/Makefile
index b24fe3f574ccfc..8fb3c66232a1e0 100644
--- a/lldb/test/API/macosx/macCatalystAppMacOSFramework/Makefile
+++ b/lldb/test/API/macosx/macCatalystAppMacOSFramework/Makefile
@@ -5,6 +5,7 @@ override TRIPLE := $(ARCH)-apple-ios13.0-macabi
CFLAGS_EXTRAS := -target $(TRIPLE)
# FIXME: rdar://problem/54986190
+override CCC=clang
override CC=xcrun clang
all: libfoo.dylib a.out
diff --git a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
index b712afdd7560a7..3f5645a486bcb4 100644
--- a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
+++ b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
@@ -59,10 +59,10 @@ def run_with(self, arch, os, vers, env, expected_load_command):
self.build(
dictionary={
"ARCH": arch,
- "CC": clang,
"ARCH_CFLAGS": "-target {} {}".format(triple, version_min),
"SDKROOT": sdk_root,
- }
+ },
+ compiler=clang,
)
self.check_load_commands(expected_load_command)
diff --git a/lldb/test/API/python_api/frame/inlines/Makefile b/lldb/test/API/python_api/frame/inlines/Makefile
index e6d9d8310a0fa8..da37368a041a34 100644
--- a/lldb/test/API/python_api/frame/inlines/Makefile
+++ b/lldb/test/API/python_api/frame/inlines/Makefile
@@ -1,6 +1,6 @@
C_SOURCES := inlines.c
-ifneq (,$(findstring icc,$(CC)))
+ifeq ($(CCC), icc)
CFLAGS_EXTRAS := -debug inline-debug-info
endif
diff --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
index 16297efe14372a..ed47f94e9492be 100644
--- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
+++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
@@ -71,12 +71,12 @@ def check_simulator_ostype(self, sdk, platform_name, arch=platform.machine()):
self.build(
dictionary={
"EXE": exe_name,
- "CC": clang,
"SDKROOT": sdkroot.strip(),
"ARCH": arch,
"ARCH_CFLAGS": "-target {} {}".format(triple, version_min),
"USE_SYSTEM_STDLIB": 1,
- }
+ },
+ compiler=clang,
)
exe_path = os.path.realpath(self.getBuildArtifact(exe_name))
cmd = [
More information about the lldb-commits
mailing list