From 99ee10d2b83ba4000e14fbb5639174260fcdfb1c Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 22 May 2014 21:13:30 +0000 Subject: Unify the name of compiler-rt builtins library on Linux. Call it "libclang_rt.builtins-.a" to be consistent with sanitizers/profile libraries naming. Modify Makefile and CMake build systems and Clang driver accordingly. Fixes PR19822. llvm-svn: 209474 --- clang/runtime/compiler-rt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/runtime') diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile index 9833eb901ab..ccd83a35704 100644 --- a/clang/runtime/compiler-rt/Makefile +++ b/clang/runtime/compiler-rt/Makefile @@ -126,7 +126,7 @@ TryCompile = \ # We try to build 32-bit runtimes both on 32-bit hosts and 64-bit hosts. Runtime32BitConfigs = \ - full-i386.a profile-i386.a san-i386.a asan-i386.a asan_cxx-i386.a \ + builtins-i386.a profile-i386.a san-i386.a asan-i386.a asan_cxx-i386.a \ ubsan-i386.a ubsan_cxx-i386.a # We currently only try to generate runtime libraries on x86. @@ -136,7 +136,7 @@ endif ifeq ($(ARCH),x86_64) RuntimeLibrary.linux.Configs += \ - full-x86_64.a profile-x86_64.a san-x86_64.a asan-x86_64.a \ + builtins-x86_64.a profile-x86_64.a san-x86_64.a asan-x86_64.a \ asan_cxx-x86_64.a tsan-x86_64.a msan-x86_64.a ubsan-x86_64.a \ ubsan_cxx-x86_64.a dfsan-x86_64.a lsan-x86_64.a # We need to build 32-bit ASan/UBsan libraries on 64-bit platform, and add them -- cgit v1.2.3