#2891 refs[t:2891] fix the newbrt cilk build

git-svn-id: file:///svn/toku/tokudb@23926 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/Makefile

@@ -123,7 +123,7 @@ endif
 $(NEWBRT_O_FILES): VISIBILITY=
 $(NEWBRT): $(NEWBRT_O_FILES)
 $(NEWBRT_SO): newbrt.bundle
-	$(TOKULINKER) $(SHARED) $(SYMBOLS) newbrt.bundle/*.o -o$(NEWBRT_SO)
+	$(TOKULINKER) $(SHARED) $(SYMBOLS) $(CILK_LINKER_FLAGS) newbrt.bundle/*.o -o$(NEWBRT_SO) $(CILKRTS_LIB)
 
 $(NEWBRT_BUNDLE): log_code.c log_header.h
 

newbrt/tests/Makefile

@@ -145,14 +145,6 @@ check_brtloader-test-writer-errors-3: brtloader-test-writer-errors$(BINSUF)
 check_brtloader-test-writer-errors-4: brtloader-test-writer-errors$(BINSUF)
 	$(VGRIND) ./$< $(VERBVERBOSE) -s -m --malloc_limit 0 -r 10000 dir.$@ $(SUMMARIZE_CMD)
 
-brtloader-%$(BINSUF): brtloader-%.$(OEXT)
-ifeq ($(BRTLOADER),cilk)
-	$(CILKPP) $(CILKFLAGS) $< -o $@ $(LDFLAGS)
-endif
-ifeq ($(BRTLOADER),cxx)
-	$(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS)
-endif
-
 check_%: % $(PTHREAD_LOCAL)
 	$(VGRIND) ./$< $(VERBVERBOSE) $(EXTRA_ARGS) $(SUMMARIZE_CMD)
 

toku_include/Makefile.include

@@ -538,12 +538,13 @@ endif
 SO_FLAGS=$(SHARED) $(BIN_FROM_O_FLAGS) $(EXPORTMAP)
 
 ifeq ($(BRTLOADER),cilk)
-SO_FLAGS += -Wl,-z,now
+CILK_LINKER_FLAGS = -Wl,-Bsymbolic-functions -Wl,-z,now
 ifeq ($(ARCH),x86_64)
-SO_FLAGS += -L$(CILKROOT)/lib64 -lcilkrts_pic
+CILKRTS_LIB = -L$(CILKROOT)/lib64 -lcilkrts_pic
 else
-SO_FLAGS += -L$(CILKROOT)/lib32 -lcilkrta_pic
+CILKRTS_LIB = -L$(CILKROOT)/lib32 -lcilkrta_pic
 endif
+SO_FLAGS += $(CILK_LINKER_FLAGS) $(CILKRTS_LIB)
 TOKULINKER = $(CXX)
 else
 TOKULINKER = $(CC)