diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2011-04-15 18:02:26 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2011-04-15 18:02:26 +0000 |
| commit | a8e8d5f55b513513be85892a684b147209a3d245 (patch) | |
| tree | 54c96ea978a7c0cb2c662bec0d75796def2f4a4e /runtime | |
| parent | d4c5f84bbed2ecb5ddd0f0e8316c553b2084772a (diff) | |
Doug Gregor tells me that runtime/libcxx/ is a placeholder for stuff we never
did. Delete it.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129584 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | runtime/libcxx/Makefile | 63 |
2 files changed, 0 insertions, 64 deletions
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 68ee266eca..e53d805cbd 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -2,7 +2,6 @@ set(known_subdirs "compiler-rt" - "libcxx" ) foreach (dir ${known_subdirs}) diff --git a/runtime/libcxx/Makefile b/runtime/libcxx/Makefile deleted file mode 100644 index 10d4e9bb84..0000000000 --- a/runtime/libcxx/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -##===- clang/runtime/libcxx/Makefile -----------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -# -# This file defines support for building the "libc++" C++ standard library as -# part of a Clang compiler build. -# -##===----------------------------------------------------------------------===## - -CLANG_LEVEL := ../.. -LEVEL := $(CLANG_LEVEL)/../.. -LIBRARYNAME = c++ - -LINK_LIBS_IN_SHARED = 1 -SHARED_LIBRARY = 1 - -# Include LLVM common makefile. -include $(LEVEL)/Makefile.config - -# Expect libcxx to be in llvm/projects/libcxx -LIBCXX_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/libcxx - -# Override the source root to point at the libcxx sources. -PROJ_MAKEFILE := $(PROJ_SRC_DIR)/Makefile -PROJ_SRC_DIR := $(LIBCXX_SRC_ROOT)/src -CPP.Flags := -nostdinc++ -I$(LIBCXX_SRC_ROOT)/include -CXX.Flags := -std=c++0x - -# Include LLVM makefile rules. -include $(LLVM_SRC_ROOT)/Makefile.rules - -# Force building with the just built Clang. -# -# FIXME: Do we really want to do this? It is uber slow. -# CXX := $(ToolDir)/clang - -ifeq ($(HOST_OS),Darwin) - LLVMLibsOptions += -Wl,-compatibility_version,1 - - # Don't link with default libraries. - LLVMLibsOptions += -nodefaultlibs - - # Reexport libc++abi. - LLVMLibsOptions += -Wl,-reexport_library,/usr/lib/libc++abi.dylib - - # Set dylib internal version number to submission number. - ifdef LLVM_SUBMIT_VERSION - LLVMLibsOptions += -Wl,-current_version \ - -Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION) - endif - - # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line - DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') - ifneq ($(DARWIN_VERS),8) - LLVMLibsOptions += -Wl,-install_name \ - -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" - endif -endif |