Skip to content

Commit 95dcc08

Browse files
committed
Remove change to set SDKROOT when building compiler-rt on Darwin.
This reverts the runtime library portion of r194168. As of r221621, the libclang_rt libraries for Darwin build with explicit SDK options so there is no need to set SDKROOT here. llvm-svn: 221625
1 parent 4c67655 commit 95dcc08

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

clang/runtime/compiler-rt/Makefile

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ ResourceIncludeDir := $(ResourceDir)/include
2727
PROJ_resources_lib := $(PROJ_resources)/lib
2828
PROJ_resources_include := $(PROJ_resources)/include
2929

30-
# Initialize a variable to use for extra flags to pass to the
31-
# compiler-rt make process.
32-
COMPILERRT_MAKE_FLAGS :=
33-
3430
# Expect compiler-rt to be in llvm/projects/compiler-rt
3531
COMPILERRT_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/compiler-rt
3632

@@ -106,17 +102,6 @@ ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))
106102
RuntimeLibrary.macho_embedded.Configs += \
107103
soft_static.a soft_pic.a
108104
endif
109-
110-
# Support building compiler-rt with relocatable SDKs.
111-
#
112-
# This will cause make to put SDKROOT in the environment, and since we
113-
# are using the built Clang to build compiler-rt, it to pick up that
114-
# location as the default value for the include system root.
115-
ACTIVE_SDK_PATH := $(shell xcrun --show-sdk-path 2> /dev/null)
116-
ifneq ($(ACTIVE_SDK_PATH),)
117-
COMPILERRT_MAKE_FLAGS := SDKROOT=$(ACTIVE_SDK_PATH)
118-
endif
119-
120105
endif
121106

122107
# On Linux, include a library which has all the runtime functions.
@@ -182,15 +167,13 @@ BuildRuntimeLibraries:
182167
CC="$(ToolDir)/clang" \
183168
VERBOSE=$(VERBOSE) \
184169
LLVM_ANDROID_TOOLCHAIN_DIR="$(LLVM_ANDROID_TOOLCHAIN_DIR)" \
185-
$(COMPILERRT_MAKE_FLAGS) \
186170
$(RuntimeDirs:%=clang_%)
187171
.PHONY: BuildRuntimeLibraries
188172
CleanRuntimeLibraries:
189173
$(Verb) $(MAKE) -C $(COMPILERRT_SRC_ROOT) \
190174
ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
191175
ProjObjRoot=$(PROJ_OBJ_DIR) \
192176
VERBOSE=$(VERBOSE) \
193-
$(COMPILERRT_MAKE_FLAGS) \
194177
clean
195178
.PHONY: CleanRuntimeLibraries
196179
RuntimeHeader: $(ResourceIncludeDir)/sanitizer

0 commit comments

Comments
 (0)