diff --git a/bazel/scip-v900.patch b/bazel/scip-v900.patch index fb82f42a48..520e019eb9 100644 --- a/bazel/scip-v900.patch +++ b/bazel/scip-v900.patch @@ -64,7 +64,7 @@ index 0000000000..871fde8e55 +/* #undef SCIP_NO_SIGACTION */ +/* #undef SCIP_NO_STRTOK_R */ +/* #undef TPI_NONE */ -+#define TPI_TNY ++#define TPI_NONE +/* #undef TPI_OMP */ +#define SCIP_THREADSAFE +#define WITH_SCIPDEF diff --git a/bazel/scip.BUILD.bazel b/bazel/scip.BUILD.bazel index ff358ded2b..8271c09fb9 100644 --- a/bazel/scip.BUILD.bazel +++ b/bazel/scip.BUILD.bazel @@ -88,7 +88,8 @@ cc_library( ], ) + BLISS_FILE + [ "src/scip/exprinterpret_none.c", - "src/tpi/tpi_tnycthrd.c", + #"src/tpi/tpi_tnycthrd.c", + "src/tpi/tpi_none.c", ], hdrs = glob( [ @@ -104,7 +105,8 @@ cc_library( ]), copts = [ "$(STACK_FRAME_UNLIMITED)", # src/scip/reader_cnf.c - "-DTPI_TNY", # src/tpi/type_tpi_tnycthrd.h + #"-DTPI_TNY", # src/tpi/type_tpi_tnycthrd.h + "-DTPI_NONE", # src/tpi/type_tpi_none.h "-Isrc", "-Isrc/scip", ] + PLATFORM_FLAGS,