Commit 23bef2cf authored by Yoni Fogel's avatar Yoni Fogel

Addresses #1376

First attempt at using bundles for ipo_libtokudb.obj
This should allow a not-clean directory to make the optimized lib.

git-svn-id: file:///svn/toku/tokudb@8683 c7de825b-a66e-492c-adef-691d508d4ae1
parent 65dec301
...@@ -15,7 +15,9 @@ include $(TOKUROOT)toku_include/Makefile.include ...@@ -15,7 +15,9 @@ include $(TOKUROOT)toku_include/Makefile.include
CPPFLAGS+=-D_GNU_SOURCE -D_THREAD_SAFE CPPFLAGS+=-D_GNU_SOURCE -D_THREAD_SAFE
YDB=ydb.$(AEXT) YDB=ydb.$(AEXT)
YDB_BUNDLE=ydb.bundle
TYDB=tydb.$(AEXT) TYDB=tydb.$(AEXT)
TYDB=tydb.bundle
LIBNAME=libtokudb LIBNAME=libtokudb
TLIBNAME=libtokudbtrace TLIBNAME=libtokudbtrace
...@@ -96,8 +98,8 @@ endif ...@@ -96,8 +98,8 @@ endif
static_libtokudb.lib: $(YDB) $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY) static_libtokudb.lib: $(YDB) $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY)
xilib /out:$@ $^ xilib /out:$@ $^
ipo_libtokudb.obj: $(YDB) $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY) ipo_libtokudb.obj: $(YDB_BUNDLE) $(LOCKTREE_BUNDLE) $(RANGETREE_BUNDLE) $(NEWBRT_BUNDLE) $(LIBPORTABILITY_BUNDLE)
$(CC) -Qipo-c *.obj lock_tree/*.obj range_tree/*.obj ../newbrt/*.obj $(CC) $(CFLAGS) $(CPPFLAGS) -Qipo-c $(filter %.$(OEXT),$^) $(patsubst %.bundle, %.bundle/*.$(OEXT), $(filter-out %.$(OEXT),$^))
mv ipo_out.obj $@ mv ipo_out.obj $@
ipo_libtokudb.lib: ipo_libtokudb.obj ipo_libtokudb.lib: ipo_libtokudb.obj
......
...@@ -88,7 +88,8 @@ SYMBOLS = -g3 -ggdb3 ...@@ -88,7 +88,8 @@ SYMBOLS = -g3 -ggdb3
PORTABILITY= PORTABILITY=
SKIP_WARNING= SKIP_WARNING=
COMBINE_C = -combine -c COMBINE_C = -combine -c
LIBPORTABILITY = $(TOKUROOT)lib/libtokuportability.$(AEXT) LIBPORTABILITY = $(TOKUROOT)lib/libtokuportability.$(AEXT)
LIBPORTABILITY_BUNDLE = $(TOKUROOT)lib/libtokuportability.bundle
PORTABILITY_HEADERS= $(TOKUROOT)linux PORTABILITY_HEADERS= $(TOKUROOT)linux
ALWAYS_LINK= $(LIBPORTABILITY) -lz -lpthread ALWAYS_LINK= $(LIBPORTABILITY) -lz -lpthread
...@@ -326,6 +327,7 @@ endif ...@@ -326,6 +327,7 @@ endif
ifeq ($(SKIP_LOCKTREERULE),) ifeq ($(SKIP_LOCKTREERULE),)
LOCKTREE = $(TOKUROOT)src/lock_tree/locktree.$(AEXT) LOCKTREE = $(TOKUROOT)src/lock_tree/locktree.$(AEXT)
LOCKTREE_BUNDLE = $(TOKUROOT)src/lock_tree/locktree.bundle
LOCKTREE_LINEAR = $(TOKUROOT)src/lock_tree/locktree_linear.$(AEXT) LOCKTREE_LINEAR = $(TOKUROOT)src/lock_tree/locktree_linear.$(AEXT)
LOCKTREE_TLOG = $(TOKUROOT)src/lock_tree/locktree_tlog.$(AEXT) LOCKTREE_TLOG = $(TOKUROOT)src/lock_tree/locktree_tlog.$(AEXT)
LOCKTREE_LOG = $(TOKUROOT)src/lock_tree/locktree_log.$(AEXT) LOCKTREE_LOG = $(TOKUROOT)src/lock_tree/locktree_log.$(AEXT)
...@@ -335,6 +337,7 @@ endif ...@@ -335,6 +337,7 @@ endif
ifeq ($(SKIP_RANGETREERULE),) ifeq ($(SKIP_RANGETREERULE),)
RANGETREE = $(TOKUROOT)src/range_tree/rangetree.$(AEXT) RANGETREE = $(TOKUROOT)src/range_tree/rangetree.$(AEXT)
RANGETREE_BUNDLE = $(TOKUROOT)src/range_tree/rangetree.bundle
RANGETREE_LINEAR = $(TOKUROOT)src/range_tree/rangetree_linear.$(AEXT) RANGETREE_LINEAR = $(TOKUROOT)src/range_tree/rangetree_linear.$(AEXT)
RANGETREE_TLOG = $(TOKUROOT)src/range_tree/rangetree_tlog.$(AEXT) RANGETREE_TLOG = $(TOKUROOT)src/range_tree/rangetree_tlog.$(AEXT)
RANGETREE_LOG = $(TOKUROOT)src/range_tree/rangetree_log.$(AEXT) RANGETREE_LOG = $(TOKUROOT)src/range_tree/rangetree_log.$(AEXT)
......
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