Skip to content
This repository has been archived by the owner on Dec 14, 2020. It is now read-only.

Fix build from source with Clang v4 #37

Merged
merged 1 commit into from
Mar 2, 2018
Merged

Fix build from source with Clang v4 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ provides(SimpleBuild,
@build_steps begin
ChangeDirectory(builddir)
pipeline(`cat $patchdir/os-printlevel.patch`, `patch -p1 -d ..`)
pipeline(`cat $patchdir/ordered-compare-error.patch`, `patch -p1 -d ..`)
setenv(`../configure --prefix=$prefix --enable-dependency-linking
coin_skip_warn_cflags=yes coin_skip_warn_cxxflags=yes coin_skip_warn_fflags=yes
--with-coinutils-lib="-L$cbclibdir -lCoinUtils"
Expand Down
11 changes: 11 additions & 0 deletions deps/ordered-compare-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- /SYMPHONY/src/LP/lp_genfunc.c 2015-03-07 15:52:32.000000000 -0500
+++ /SYMPHONY/src/LP/lp_genfunc.c 2017-11-14 10:03:57.000000000 -0500
@@ -2419,7 +2419,7 @@
send_to_pool);

should_stop_adding_cgl_cuts(p, i, &should_stop);
- if(i < 0 && num_cuts > 0) should_stop = TRUE;
+ if(i < 0 && *num_cuts > 0) should_stop = TRUE;
//}
if (should_stop == TRUE) {
break;