summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2014-05-28 17:18:22 -0700
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2014-05-28 17:19:22 -0700
commitea04794d8de2757602b42269bcfc7864469da352 (patch)
tree7d83d46053cc13a8cdbe73f2f9696e9308c76228
parent1bb7ba59e5a1cd17b2f2ab021307eb0c69a34236 (diff)
downloadcaffe-ea04794d8de2757602b42269bcfc7864469da352.tar.gz
caffe-ea04794d8de2757602b42269bcfc7864469da352.tar.bz2
caffe-ea04794d8de2757602b42269bcfc7864469da352.zip
fix OSX 10.9 homebrew CXX doc
clang++ and not clang as accidentally committed in 2dcbcd9.
-rw-r--r--docs/installation.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installation.md b/docs/installation.md
index 1210bfc6..a6f9f137 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -111,7 +111,7 @@ If you're not using Anaconda, include `hdf5` in the list above.
#### 10.9-specific Instructions
-In OS X 10.9, clang is the default compiler and uses `libc++` as the standard library.
+In OS X 10.9, clang++ is the default C++ compiler and uses `libc++` as the standard library.
However, NVIDIA CUDA (even version 6.0) currently links only with `libstdc++`.
This makes it necessary to change the compilation settings for each of the dependencies.
@@ -130,7 +130,7 @@ For each of these formulas, `brew edit FORMULA`, and add the ENV definitions as
ENV.append "CFLAGS", "-stdlib=libstdc++"
ENV.append "LDFLAGS", "-stdlib=libstdc++ -lstdc++"
# The following is necessary because libtool likes to strip LDFLAGS:
- ENV["CXX"] = "/usr/bin/clang -stdlib=libstdc++"
+ ENV["CXX"] = "/usr/bin/clang++ -stdlib=libstdc++"
...
To edit the formulae in turn, run