Revert "Change Ubuntu default to clang-4.0 " (RobotLocomotion#7472)

Tomato1107 · Nov 14, 2017 · c5ba75f · c5ba75f
1 parent 9ecab7b
commit c5ba75f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/doc/developers.rst b/doc/developers.rst
@@ -77,18 +77,14 @@ supported for CMake builds using the "Unix Makefiles" generator.
 | Operating System            | Build System   | C/C++ Compiler  | Java       | MATLAB (Optional) | Python |
 +=============================+================+=================+============+===================+========+
 +-----------------------------+----------------+-----------------+------------+-------------------+--------+
-| Ubuntu 16.04 LTS ("Xenial") | | Bazel 0.6.1  | | Clang 4.0     | OpenJDK 8  | R2017a            | 2.7.11 |
-|                             | | CMake 3.5.1  | | Clang 3.9     |            |                   |        |
-|                             | |              | | GCC 5.4       |            |                   |        |
+| Ubuntu 16.04 LTS ("Xenial") | | Bazel 0.6.1  | | Clang 3.9     | OpenJDK 8  | R2017a            | 2.7.11 |
+|                             | | CMake 3.5.1  | | GCC 5.4       |            |                   |        |
 +-----------------------------+----------------+-----------------+------------+                   +--------+
 | macOS 10.12 ("Sierra")      | | Bazel 0.6.1  | Apple Clang 9.0 | Oracle 1.8 |                   | 2.7.14 |
 +-----------------------------+ | CMake 3.10.0 |                 |            +-------------------+        |
 | macOS 10.13 ("High Sierra") |                |                 |            | R2017b            |        |
 +-----------------------------+----------------+-----------------+------------+-------------------+--------+
 
-On Ubuntu 16.04, the combination of CMake + Clang 4.0 is not yet supported,
-and the combination of Bazel + Clang 3.9 is deprecated.
-
 macOS 10.13 ("High Sierra") MATLAB support is experimental and untested in continuous
 integration.
 

diff --git a/tools/cc_toolchain/CROSSTOOL b/tools/cc_toolchain/CROSSTOOL
@@ -20,7 +20,7 @@ default_toolchain {
 # We use Clang on Ubuntu by default. To use gcc, specify --compiler=gcc-5.
 default_toolchain {
   cpu: "k8"
-  toolchain_identifier: "clang-4.0-linux"
+  toolchain_identifier: "clang-3.9-linux"
 }
 
 # GCC 6.x on Linux