close[t:3640] Candidate fix using new libcilkrts.a. Fixes #3640.

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

newbrt/Makefile

@@ -106,6 +106,7 @@ NEWBRT_O_FILES += brtloader.$(OEXT) quicklz.$(OEXT) compress.$(OEXT)
 brtloader.$(OEXT): $(DEPEND_COMPILE)
 
 $(NEWBRT_O_FILES): VISIBILITY=
+$(NEWBRT_SO): DISABLE_WARNING += 10237 # Do not complain about -lcilkrts being linked in dynamically, static library not available
 $(NEWBRT_SO): $(NEWBRT_O_FILES)
 	echo $(patsubst %,newbrt/%,$(NEWBRT_O_FILES)) > ../lib/newbrt.olist
 	$(TOKULINKER) $(SHARED) $(SYMBOLS) $(GCOV_FLAGS) $(SKIP_WARNING) $(NEWBRT_O_FILES) -o$(NEWBRT_SO) $(LINUX_NOSTDLIB) $(LCILKRTS)

src/Makefile

@@ -76,8 +76,8 @@ NEWBRT_OFILES = $(patsubst %,../%,$(shell cat ../lib/newbrt.olist))
 $(LIBRARY): LINK_FILES=$(OBJS) $(LOCKTREE) $(RANGETREE) $(NEWBRT_OFILES)
 ifeq ($(CC),icc)
  ifeq ($(HAVE_CILK),1)
-  ifeq (0,1)
-   #$(LIBRARY): LINK_FILES+=$(wildcard ../cilk_icc/*.o)
+  ifeq (0,0)
+   $(LIBRARY): LINK_FILES+=$(wildcard ../cilk_icc/*.o)
   else
    $(LIBRARY): LINK_FILES+=-lcilkrts
   endif

toku_include/Makefile.include

@@ -166,7 +166,7 @@ PORTABILITY_HEADERS= $(TOKUROOT)$(SYSTEM)
 ALWAYS_LINK= -lz -lpthread 
 ifeq ($(CC),icc)
 # needed for things like intel_fast_memset(), intel_sse2_strlen()
-ALWAYS_LINK+=-lirc
+ALWAYS_LINK+=-Bstatic -lirc -Bdynamic -lstdc++
 endif
 C99       = -std=c99
 W64       = #-Wshorten-64-to-32
@@ -536,7 +536,7 @@ EXPORTMAPFILE=export.map
 EXPORTMAP = -Wl,--version-script=$(EXPORTMAPFILE)
 SHARED=-shared
 ifeq ($(CC),icc)
-SHARED += -static-intel
+SHARED += -static-intel -nodefaultlibs
 endif
 endif
 ifeq ($(SOEXT),dll)