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

Unified 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, 11 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/pnacl-clang-src/nacl.patch
diff --git a/ports/pnacl-clang-src/nacl.patch b/ports/pnacl-clang-src/nacl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ec09e0569fad0f3c7dd0c90d1c7bb39b737b428a
--- /dev/null
+++ b/ports/pnacl-clang-src/nacl.patch
@@ -0,0 +1,45 @@
+diff --git a/tools/libclang/CIndexer.cpp b/tools/libclang/CIndexer.cpp
+--- a/tools/libclang/CIndexer.cpp
++++ b/tools/libclang/CIndexer.cpp
+@@ -37,7 +37,7 @@
+
+ #ifdef LLVM_ON_WIN32
+ #include <windows.h>
+-#else
++#elif !defined(_NEWLIB_VERSION)
+ #include <dlfcn.h>
+ #endif
+
+@@ -69,6 +69,8 @@ const std::string &CIndexer::getClangResourcesPath() {
+ #endif
+
+ LibClangPath += llvm::sys::path::parent_path(path);
++#elif defined(_NEWLIB_VERSION)
++ LibClangPath += "";
+ #else
+ // This silly cast below avoids a C++ warning.
+ Dl_info info;
+diff --git a/unittests/Makefile b/unittests/Makefile
+--- a/unittests/Makefile
++++ b/unittests/Makefile
+@@ -10,6 +10,14 @@
+ # If CLANG_LEVEL is not set, then we are the top-level Makefile. Otherwise, we
+ # are being included from a subdirectory makefile.
+
++ifeq ($(HOST_OS),NativeClient)
++all:
++ echo skipping
++
++install:
++ echo skipping
++else
++
+ ifndef CLANG_LEVEL
+
+ IS_UNITTEST_LEVEL := 1
+@@ -33,3 +41,5 @@ MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
+ include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
+
+ endif # IS_UNITTEST_LEVEL
++
++endif
« 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