Commit e3aef035 authored by Yoni Fogel's avatar Yoni Fogel

Addresses #1322

Port makefile change to windows

git-svn-id: file:///svn/toku/tokudb.1032b@8325 c7de825b-a66e-492c-adef-691d508d4ae1
parent da1894f7
...@@ -357,8 +357,18 @@ O_FROM_C_FLAGS= $(CFLAGS) $(CPPFLAGS) -c $(OOUTPUT)$@ ...@@ -357,8 +357,18 @@ O_FROM_C_FLAGS= $(CFLAGS) $(CPPFLAGS) -c $(OOUTPUT)$@
%.$(AEXT): %.$(AEXT):
$(MAYBEATSIGN)$(AR) $(ARFLAGS) $(AROUTPUT)$@ $(filter %.$(OEXT),$^) $(patsubst %.bundle, %.bundle/*.$(OEXT), $(filter-out %.$(OEXT),$^)) $(MAYBEATSIGN)$(AR) $(ARFLAGS) $(AROUTPUT)$@ $(filter %.$(OEXT),$^) $(patsubst %.bundle, %.bundle/*.$(OEXT), $(filter-out %.$(OEXT),$^))
ifeq ($(AEXT),a)
%.bundle: %.$(AEXT) %.bundle: %.$(AEXT)
mkdir -p $@; cd $@; $(AR) x ../$(<F) $(MAYBEATSIGN)mkdir -p $@ && cd $@ && $(AR) x ../$(<F)
$(MAYBEATSIGN)touch $@
else
#Windows lib cannot extract everything.
#Do a for loop and extract one at a time.
%.bundle: %.$(AEXT)
$(MAYBEATSIGN)mkdir -p $@ && cd $@ && for ofile in `lib /list ../$(<F) |dos2unix |grep -F obj`; do lib /extract:$$ofile ../$(<F); done
$(MAYBEATSIGN)touch $@
endif
ifeq ($(SOEXT),so) ifeq ($(SOEXT),so)
EXPORTMAPFILE=export.map EXPORTMAPFILE=export.map
......
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