Commit 30088185 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

refs[t:2606] statically link to cilkrts_pic

git-svn-id: file:///svn/toku/tokudb@20830 c7de825b-a66e-492c-adef-691d508d4ae1
parent 5a83acc1
...@@ -536,13 +536,22 @@ EXPORTMAP=/link /def:$(EXPORTMAPFILE) ...@@ -536,13 +536,22 @@ EXPORTMAP=/link /def:$(EXPORTMAPFILE)
endif endif
SO_FLAGS=$(SHARED) $(BIN_FROM_O_FLAGS) $(EXPORTMAP) SO_FLAGS=$(SHARED) $(BIN_FROM_O_FLAGS) $(EXPORTMAP)
%.$(SOEXT): $(EXPORTMAPFILE)
ifeq ($(BRTLOADER),cilk) ifeq ($(BRTLOADER),cilk)
$(CILKPP) $(SO_FLAGS) SO_FLAGS += -Wl,-z,now
ifeq ($(ARCH),x86_64)
SO_FLAGS += -L$(CILKROOT)/lib64 -lcilkrts_pic
else
SO_FLAGS += -L$(CILKROOT)/lib32 -lcilkrta_pic
endif
TOKULINKER = $(CXX)
else else
$(CC) $(SO_FLAGS) TOKULINKER = $(CC)
endif endif
%.$(SOEXT): $(EXPORTMAPFILE)
$(TOKULINKER) $(SO_FLAGS)
#Testing tools #Testing tools
ifeq ($(SUMMARIZE),1) ifeq ($(SUMMARIZE),1)
SUMMARIZE_CMD = ;if test $$? = 0; then printf "%-60sPASS\n" $(HERE)/$@; else printf "%-60sFAIL\n" $(HERE)/$@ ; test 0 = 1; fi SUMMARIZE_CMD = ;if test $$? = 0; then printf "%-60sPASS\n" $(HERE)/$@; else printf "%-60sFAIL\n" $(HERE)/$@ ; test 0 = 1; fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment