diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2015-04-08 08:55:49 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2015-04-09 15:04:38 -0700 |
| commit | 4c5e43da7792f75567b693105cc53e3f1992ad98 (patch) | |
| tree | 1b2c9792582e12f5af0b1512e3094425f0dc0df9 /tools/llvm-config | |
| parent | c75239e6119d0f9a74c57099d91cbc9bde56bf33 (diff) | |
| download | external_llvm-4c5e43da7792f75567b693105cc53e3f1992ad98.zip external_llvm-4c5e43da7792f75567b693105cc53e3f1992ad98.tar.gz external_llvm-4c5e43da7792f75567b693105cc53e3f1992ad98.tar.bz2 | |
Update aosp/master llvm for rebase to r233350
Change-Id: I07d935f8793ee8ec6b7da003f6483046594bca49
Diffstat (limited to 'tools/llvm-config')
| -rw-r--r-- | tools/llvm-config/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/llvm-config/llvm-config.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index 50c84e6..d2ef45a 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/tools/llvm-config/CMakeLists.txt @@ -44,7 +44,7 @@ if(CMAKE_CROSSCOMPILING) WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} COMMENT "Building native llvm-config...") add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_EXE}) - add_dependencies(${project}NativeLLVMConfig ConfigureNativeLLVM) + add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE) add_dependencies(llvm-config ${project}NativeLLVMConfig) endif(CMAKE_CROSSCOMPILING) diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp index 224035a..879b9ab 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp @@ -91,9 +91,9 @@ static void VisitComponent(StringRef Name, /// are required to link the given components. /// \param IncludeNonInstalled - Whether non-installed components should be /// reported. -void ComputeLibsForComponents(const std::vector<StringRef> &Components, - std::vector<StringRef> &RequiredLibs, - bool IncludeNonInstalled) { +static void ComputeLibsForComponents(const std::vector<StringRef> &Components, + std::vector<StringRef> &RequiredLibs, + bool IncludeNonInstalled) { std::set<AvailableComponent*> VisitedComponents; // Build a map of component names to information. @@ -126,7 +126,7 @@ void ComputeLibsForComponents(const std::vector<StringRef> &Components, /* *** */ -void usage() { +static void usage() { errs() << "\ usage: llvm-config <OPTION>... [<COMPONENT>...]\n\ \n\ |