File tree 4 files changed +15
-5
lines changed
4 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -501,6 +501,12 @@ else
501
501
build_shlibdir := $(build_libdir )
502
502
endif
503
503
504
+ ifeq ($(OS ), FreeBSD )
505
+ LOCALBASE ?= /usr /local
506
+ else
507
+ LOCALBASE ?= /usr
508
+ endif
509
+
504
510
ifeq (exists , $(shell [ -e $(JULIAHOME )/Make . user ] && echo exists ))
505
511
include $(JULIAHOME )/Make . user
506
512
endif
@@ -837,16 +843,16 @@ LIBMNAME := libopenlibm
837
843
endif
838
844
839
845
ifeq ($(USE_SYSTEM_LIBUV ), 1 )
840
- LIBUV := / usr /lib /libuv -julia . a
841
- LIBUV_INC := / usr /include
846
+ LIBUV := $( LOCALBASE ) /lib /libuv -julia . a
847
+ LIBUV_INC := $( LOCALBASE ) /include
842
848
else
843
849
LIBUV := $(build_libdir )/libuv . a
844
850
LIBUV_INC := $(build_includedir )
845
851
endif
846
852
847
853
ifeq ($(USE_SYSTEM_UTF8PROC ), 1 )
848
854
LIBUTF8PROC := -lutf8proc
849
- UTF8PROC_INC := / usr /include
855
+ UTF8PROC_INC := $( LOCALBASE ) /include
850
856
else
851
857
LIBUTF8PROC := $(build_libdir )/libutf8proc . a
852
858
UTF8PROC_INC := $(build_includedir )
Original file line number Diff line number Diff line change 6
6
</div >
7
7
8
8
Linux, OSX: [ ![ Build Status] ( https://api.travis-ci.org/JuliaLang/julia.svg?branch=master )] ( https://travis-ci.org/JuliaLang/julia )
9
-
9
+
10
10
Windows: [ ![ Build status] ( https://ci.appveyor.com/api/projects/status/dvial98s5vi6ealt/branch/master?svg=true )] ( https://ci.appveyor.com/project/JuliaLang/julia/branch/master )
11
11
12
12
Code Coverage: [ ![ Coverage Status] ( https://coveralls.io/repos/JuliaLang/julia/badge.svg?branch=master )] ( https://coveralls.io/r/JuliaLang/julia?branch=master ) [ ![ codecov.io] ( http://codecov.io/github/JuliaLang/julia/coverage.svg?branch=master )] ( http://codecov.io/github/JuliaLang/julia?branch=master )
Original file line number Diff line number Diff line change @@ -101,7 +101,7 @@ install-suitesparse: $(build_prefix)/manifest/suitesparse install-suitesparse-wr
101
101
# SUITESPARSE WRAPPER
102
102
103
103
ifeq ($(USE_SYSTEM_SUITESPARSE ) , 1)
104
- SUITESPARSE_INC := -I /usr /include/suitesparse
104
+ SUITESPARSE_INC := -I $( LOCALBASE ) /include/suitesparse
105
105
SUITESPARSE_LIB := -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
106
106
else
107
107
SUITESPARSE_INC := -I $(BUILDDIR ) /SuiteSparse-$(SUITESPARSE_VER ) /CHOLMOD/Include -I $(BUILDDIR ) /SuiteSparse-$(SUITESPARSE_VER ) /SuiteSparse_config -I $(BUILDDIR ) /SuiteSparse-$(SUITESPARSE_VER ) /SPQR/Include
Original file line number Diff line number Diff line change 35
35
FLAGS += -DJL_BUILD_UNAME='"$(OS ) "'
36
36
endif
37
37
38
+ ifeq ($(OS ) ,FreeBSD)
39
+ FLAGS += -I$(LOCALBASE ) /include
40
+ endif
41
+
38
42
SRCS := \
39
43
jltypes gf typemap ast builtins module interpreter symbol \
40
44
dlload sys init task array dump toplevel jl_uv datatype \
You can’t perform that action at this time.
0 commit comments