File tree 2 files changed +1
-15
lines changed
2 files changed +1
-15
lines changed Original file line number Diff line number Diff line change 3
3
set -e
4
4
5
5
PINK_PATH=$PWD
6
-
7
- # We depend on slash
8
- SLASH_PATH=$1
9
- if test -z $SLASH_PATH ; then
10
- SLASH_PATH=$PINK_PATH /third/slash
11
- fi
12
-
13
- if [[ ! -d $SLASH_PATH ]]; then
14
- echo " Slash library is not available"
15
- exit 1
16
- fi
6
+ SLASH_PATH=$PINK_PATH /third/slash
17
7
cd $SLASH_PATH /slash && make
18
8
UNAME_S=` uname -s`
19
9
if test " x$UNAME_S " = " xDarwin" ; then
23
13
# Compile pink
24
14
cd $PINK_PATH
25
15
make SLASH_PATH=$SLASH_PATH
26
- cd rondis && make SLASH_PATH=$SLASH_PATH
Original file line number Diff line number Diff line change @@ -33,9 +33,6 @@ SLASH_LIBRARY=$(SLASH_PATH)/slash/lib/libslash.a
33
33
CXXFLAGS+ = -I$(PINK_INCLUDE_DIR ) -I$(SLASH_INCLUDE_DIR )
34
34
35
35
DEP_LIBS = $(PINK_LIBRARY ) $(SLASH_LIBRARY )
36
- ifeq ($(UNAME_S ) ,Darwin)
37
- DEP_LIBS+ = /Users/mikael/rondb_2410_install/lib/libprotobuf.dylib
38
- endif
39
36
LDFLAGS := $(DEP_LIBS ) $(LDFLAGS )
40
37
41
38
bg_thread : bg_thread.cc
You can’t perform that action at this time.
0 commit comments