From 9a4dcb5ede3c9943c0809608f62f18f35eff9ba7 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Fri, 3 Jul 2020 11:10:48 +0200
Subject: [PATCH] cleanup

---
 WORKSPACE                   |  7 -------
 ortools/linear_solver/BUILD | 32 +++++++++++---------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index ba098c7fa7..d8e554a95c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -85,10 +85,3 @@ http_archive(
     url = "https://github.com/google/or-tools/releases/download/v7.7/scip-7.0.1.tgz",
 )
 
-#http_archive(
-#    name = "scip",
-#    build_file = "//bazel:scip.BUILD",
-#    sha256 = "033bf240298d3a1c92e8ddb7b452190e0af15df2dad7d24d0572f10ae8eec5aa",
-#    #url = "http://scip.zib.de/download/release/scip-7.0.1.tgz",
-#    url = "file://dependencies/archives/scip-7.0.1.tgz",
-#)
\ No newline at end of file
diff --git a/ortools/linear_solver/BUILD b/ortools/linear_solver/BUILD
index 0344ef0177..3810fd4d60 100644
--- a/ortools/linear_solver/BUILD
+++ b/ortools/linear_solver/BUILD
@@ -42,41 +42,31 @@ cc_proto_library(
 )
 
 # You can include the interfaces to different solvers by invoking '--define'
-# flags. By default only GLOP interface is included.
+# flags. By default GLOP, BOP, SCIP, GUROBI, and CP-SAT interface are included.
 #
 # For instance, if you want to use the GLPK solver, build with
 # '--define USE_GLPK=' (or add it to your bazel.rc file). This will download,
 # build and link to GLPK.
-#
-# Currently compiling with '--define USE_BOP=' flag is broken due to the
-# circular dependency:
-# .-> //ortools/linear_solver:linear_solver
-# |   //ortools/bop:integral_solver
-# |   //ortools/bop:bop_solver
-# |   //ortools/bop:complete_optimizer
-# |   //ortools/sat:optimization
-# `-- //ortools/linear_solver:linear_solver
-
 cc_library(
     name = "linear_solver",
     srcs = [
-        "linear_expr.cc",
-        "linear_solver.cc",
-        "linear_solver_callback.cc",
-        "model_exporter.cc",
-        "model_validator.cc",
+        "bop_interface.cc",
         "glop_interface.cc",
         "glop_utils.cc",
-        "bop_interface.cc",
-        "sat_interface.cc",
-        "sat_proto_solver.cc",
-        "sat_solver_utils.cc",
         "gurobi_environment.cc",
         "gurobi_interface.cc",
         "gurobi_proto_solver.cc",
+        "linear_expr.cc",
+        "linear_solver_callback.cc",
+        "linear_solver.cc",
+        "lpi_glop.cpp",
+        "model_exporter.cc",
+        "model_validator.cc",
+        "sat_interface.cc",
+        "sat_proto_solver.cc",
+        "sat_solver_utils.cc",
         "scip_interface.cc",
         "scip_proto_solver.cc",
-        "lpi_glop.cpp",
     ] + select({
         ":with_cbc": ["cbc_interface.cc"],
         "//conditions:default": [],