Skip to content

Commit aba86dd

Browse files
RONDB-756: Review comment handling
1 parent e20f9ab commit aba86dd

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

pink/build.sh

+1-12
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,7 @@
33
set -e
44

55
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
177
cd $SLASH_PATH/slash && make
188
UNAME_S=`uname -s`
199
if test "x$UNAME_S" = "xDarwin" ; then
@@ -23,4 +13,3 @@ fi
2313
# Compile pink
2414
cd $PINK_PATH
2515
make SLASH_PATH=$SLASH_PATH
26-
cd rondis && make SLASH_PATH=$SLASH_PATH

pink/examples/Makefile

-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ SLASH_LIBRARY=$(SLASH_PATH)/slash/lib/libslash.a
3333
CXXFLAGS+= -I$(PINK_INCLUDE_DIR) -I$(SLASH_INCLUDE_DIR)
3434

3535
DEP_LIBS = $(PINK_LIBRARY) $(SLASH_LIBRARY)
36-
ifeq ($(UNAME_S),Darwin)
37-
DEP_LIBS+= /Users/mikael/rondb_2410_install/lib/libprotobuf.dylib
38-
endif
3936
LDFLAGS := $(DEP_LIBS) $(LDFLAGS)
4037

4138
bg_thread: bg_thread.cc

0 commit comments

Comments
 (0)