summaryrefslogtreecommitdiff
path: root/sccomp
diff options
context:
space:
mode:
Diffstat (limited to 'sccomp')
-rw-r--r--sccomp/Library_solver.mk10
-rw-r--r--sccomp/Module_sccomp.mk2
2 files changed, 2 insertions, 10 deletions
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index c5531059bc79..e1b2ca3fdfeb 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -35,19 +35,11 @@ $(eval $(call gb_Library_use_libraries,solver,\
$(eval $(call gb_Library_use_externals,solver,\
boost_headers \
- $(WITH_LPSOLVER) \
+ lpsolve \
))
-ifeq ($(WITH_LPSOLVER),lpsolve)
$(eval $(call gb_Library_add_exception_objects,solver,\
sccomp/source/solver/solver-lpsolve \
))
-else ifeq ($(WITH_LPSOLVER),coinmp)
-$(eval $(call gb_Library_add_exception_objects,solver,\
- sccomp/source/solver/solver \
-))
-
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
index d250e3b574de..dd56f872ecac 100644
--- a/sccomp/Module_sccomp.mk
+++ b/sccomp/Module_sccomp.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Module_Module,sccomp))
-ifneq ($(WITH_LPSOLVER),)
+ifeq ($(ENABLE_LPSOLVE),TRUE)
$(eval $(call gb_Module_add_targets,sccomp,\
Library_solver \