Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: ports/pnacl-clang-src/nacl.patch

Issue 1607793004: Update pnacl toolchain version (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ports/pnacl-binutils-x86-src/pkg_info ('k') | ports/pnacl-clang-src/pkg_info » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/tools/libclang/CIndexer.cpp b/tools/libclang/CIndexer.cpp
2 --- a/tools/libclang/CIndexer.cpp
3 +++ b/tools/libclang/CIndexer.cpp
4 @@ -37,7 +37,7 @@
5
6 #ifdef LLVM_ON_WIN32
7 #include <windows.h>
8 -#else
9 +#elif !defined(_NEWLIB_VERSION)
10 #include <dlfcn.h>
11 #endif
12
13 @@ -69,6 +69,8 @@ const std::string &CIndexer::getClangResourcesPath() {
14 #endif
15
16 LibClangPath += llvm::sys::path::parent_path(path);
17 +#elif defined(_NEWLIB_VERSION)
18 + LibClangPath += "";
19 #else
20 // This silly cast below avoids a C++ warning.
21 Dl_info info;
22 diff --git a/unittests/Makefile b/unittests/Makefile
23 --- a/unittests/Makefile
24 +++ b/unittests/Makefile
25 @@ -10,6 +10,14 @@
26 # If CLANG_LEVEL is not set, then we are the top-level Makefile. Otherwise, we
27 # are being included from a subdirectory makefile.
28
29 +ifeq ($(HOST_OS),NativeClient)
30 +all:
31 + echo skipping
32 +
33 +install:
34 + echo skipping
35 +else
36 +
37 ifndef CLANG_LEVEL
38
39 IS_UNITTEST_LEVEL := 1
40 @@ -33,3 +41,5 @@ MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
41 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
42
43 endif # IS_UNITTEST_LEVEL
44 +
45 +endif
OLDNEW
« no previous file with comments | « ports/pnacl-binutils-x86-src/pkg_info ('k') | ports/pnacl-clang-src/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698