Skip to content

Commit e5334a8

Browse files
hgt312drivanov
authored andcommitted
Fix lack of dylib support in Makefile when use lapack (apache#15813)
* fix * add another if-else pair
1 parent 5f50750 commit e5334a8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,12 @@ ifeq ($(USE_LAPACK), 1)
220220
ifeq ($(USE_BLAS),$(filter $(USE_BLAS),blas openblas atlas mkl))
221221
ifeq (,$(wildcard $(USE_LAPACK_PATH)/liblapack.a))
222222
ifeq (,$(wildcard $(USE_LAPACK_PATH)/liblapack.so))
223+
ifeq (,$(wildcard $(USE_LAPACK_PATH)/liblapack.dylib))
223224
ifeq (,$(wildcard /lib/liblapack.a))
224225
ifeq (,$(wildcard /lib/liblapack.so))
225226
ifeq (,$(wildcard /usr/lib/liblapack.a))
226227
ifeq (,$(wildcard /usr/lib/liblapack.so))
228+
ifeq (,$(wildcard /usr/lib/liblapack.dylib))
227229
ifeq (,$(wildcard /usr/lib64/liblapack.a))
228230
ifeq (,$(wildcard /usr/lib64/liblapack.so))
229231
USE_LAPACK = 0
@@ -238,6 +240,8 @@ endif
238240
endif
239241
endif
240242
endif
243+
endif
244+
endif
241245

242246
# lapack settings.
243247
ifeq ($(USE_LAPACK), 1)
@@ -761,7 +765,7 @@ ratcheck: build/rat/apache-rat/target/apache-rat-0.13.jar
761765

762766
ifneq ($(EXTRA_OPERATORS),)
763767
clean: rclean cyclean $(EXTRA_PACKAGES_CLEAN)
764-
$(RM) -r build lib bin deps *~ */*~ */*/*~ */*/*/*~
768+
$(RM) -r build lib bin deps *~ */*~ */*/*~ */*/*/*~
765769
(cd scala-package && mvn clean) || true
766770
cd $(DMLC_CORE); $(MAKE) clean; cd -
767771
cd $(PS_PATH); $(MAKE) clean; cd -
@@ -772,7 +776,7 @@ clean: rclean cyclean $(EXTRA_PACKAGES_CLEAN)
772776
$(RM) -r $(patsubst %, %/*.o, $(EXTRA_OPERATORS)) $(patsubst %, %/*/*.o, $(EXTRA_OPERATORS))
773777
else
774778
clean: rclean mkldnn_clean cyclean testclean $(EXTRA_PACKAGES_CLEAN)
775-
$(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~
779+
$(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~
776780
(cd scala-package && mvn clean) || true
777781
cd $(DMLC_CORE); $(MAKE) clean; cd -
778782
cd $(PS_PATH); $(MAKE) clean; cd -

0 commit comments

Comments
 (0)