Skip to content

Commit a1ad4d1

Browse files
ghemawatghemawat
committed
Build fixes and cleanups:
(1) Separate out C++ and CC flags (fixes c_test compilation) (2) Move snappy/perftools detection to script (3) Fix db_bench_sqlite3 and db_bench_tree_db build rules
1 parent 9013f13 commit a1ad4d1

File tree

3 files changed

+114
-113
lines changed

3 files changed

+114
-113
lines changed

‎Makefile

Lines changed: 14 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -16,67 +16,16 @@ OPT ?= -O2 -DNDEBUG # (A) Production use (optimized mode)
1616

1717
# detect what platform we're building on
1818
$(shell sh ./build_detect_platform)
19-
# this file is generated by build_detect_platform to set build flags
19+
# this file is generated by build_detect_platform to set build flags and sources
2020
include build_config.mk
2121

22-
# If Snappy is installed, add compilation and linker flags
23-
# (see http://code.google.com/p/snappy/)
24-
ifeq ($(SNAPPY), 1)
25-
SNAPPY_CFLAGS=-DSNAPPY
26-
SNAPPY_LDFLAGS=-lsnappy
27-
else
28-
SNAPPY_CFLAGS=
29-
SNAPPY_LDFLAGS=
30-
endif
22+
CFLAGS += -c -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
23+
CXXFLAGS += -c -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT)
3124

32-
# If Google Perf Tools are installed, add compilation and linker flags
33-
# (see http://code.google.com/p/google-perftools/)
34-
ifeq ($(GOOGLE_PERFTOOLS), 1)
35-
GOOGLE_PERFTOOLS_LDFLAGS=-ltcmalloc
36-
else
37-
GOOGLE_PERFTOOLS_LDFLAGS=
38-
endif
25+
LDFLAGS += $(PLATFORM_LDFLAGS)
3926

40-
CFLAGS = -c -I. -I./include $(PORT_CFLAGS) $(PLATFORM_CFLAGS) $(OPT) $(SNAPPY_CFLAGS)
41-
42-
LDFLAGS += $(PLATFORM_LDFLAGS) $(SNAPPY_LDFLAGS) $(GOOGLE_PERFTOOLS_LDFLAGS)
43-
44-
LIBOBJECTS = \
45-
./db/builder.o \
46-
./db/c.o \
47-
./db/db_impl.o \
48-
./db/db_iter.o \
49-
./db/filename.o \
50-
./db/dbformat.o \
51-
./db/log_reader.o \
52-
./db/log_writer.o \
53-
./db/memtable.o \
54-
./db/repair.o \
55-
./db/table_cache.o \
56-
./db/version_edit.o \
57-
./db/version_set.o \
58-
./db/write_batch.o \
59-
./port/port_posix.o \
60-
./table/block.o \
61-
./table/block_builder.o \
62-
./table/format.o \
63-
./table/iterator.o \
64-
./table/merger.o \
65-
./table/table.o \
66-
./table/table_builder.o \
67-
./table/two_level_iterator.o \
68-
./util/arena.o \
69-
./util/cache.o \
70-
./util/coding.o \
71-
./util/comparator.o \
72-
./util/crc32c.o \
73-
./util/env.o \
74-
./util/env_posix.o \
75-
./util/hash.o \
76-
./util/histogram.o \
77-
./util/logging.o \
78-
./util/options.o \
79-
./util/status.o
27+
LIBOBJECTS = $(SOURCES:.cc=.o)
28+
MEMENVOBJECTS = $(MEMENV_SOURCES:.cc=.o)
8029

8130
TESTUTIL = ./util/testutil.o
8231
TESTHARNESS = ./util/testharness.o $(TESTUTIL)
@@ -121,13 +70,13 @@ $(LIBRARY): $(LIBOBJECTS)
12170
$(AR) -rs $@ $(LIBOBJECTS)
12271

12372
db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL)
124-
$(CXX) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@
73+
$(CXX) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LDFLAGS)
12574

12675
db_bench_sqlite3: doc/bench/db_bench_sqlite3.o $(LIBOBJECTS) $(TESTUTIL)
127-
$(CXX) -lsqlite3 doc/bench/db_bench_sqlite3.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LDFLAGS
76+
$(CXX) doc/bench/db_bench_sqlite3.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LDFLAGS) -lsqlite3
12877

12978
db_bench_tree_db: doc/bench/db_bench_tree_db.o $(LIBOBJECTS) $(TESTUTIL)
130-
$(CXX) $(LDFLAGS) -lkyotocabinet doc/bench/db_bench_tree_db.o $(LIBOBJECTS) $(TESTUTIL) -o $@
79+
$(CXX) doc/bench/db_bench_tree_db.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LDFLAGS) -lkyotocabinet
13180

13281
arena_test: util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS)
13382
$(CXX) util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS)
@@ -177,9 +126,9 @@ version_set_test: db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS)
177126
write_batch_test: db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS)
178127
$(CXX) db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS)
179128

180-
$(MEMENVLIBRARY) : helpers/memenv/memenv.o
129+
$(MEMENVLIBRARY) : $(MEMENVOBJECTS)
181130
rm -f $@
182-
$(AR) -rs $@ helpers/memenv/memenv.o
131+
$(AR) -rs $@ $(MEMENVOBJECTS)
183132

184133
memenv_test : helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS)
185134
$(CXX) helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) -o $@ $(LDFLAGS)
@@ -193,9 +142,9 @@ IOSVERSION=$(shell defaults read /Developer/Platforms/iPhoneOS.platform/version
193142

194143
.cc.o:
195144
mkdir -p ios-x86/$(dir $@)
196-
$(SIMULATORROOT)/usr/bin/$(CXX) $(CFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 $< -o ios-x86/$@
145+
$(SIMULATORROOT)/usr/bin/$(CXX) $(CXXFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 $< -o ios-x86/$@
197146
mkdir -p ios-arm/$(dir $@)
198-
$(DEVICEROOT)/usr/bin/$(CXX) $(CFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 $< -o ios-arm/$@
147+
$(DEVICEROOT)/usr/bin/$(CXX) $(CXXFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 $< -o ios-arm/$@
199148
lipo ios-x86/$@ ios-arm/$@ -create -output $@
200149

201150
.c.o:
@@ -207,7 +156,7 @@ IOSVERSION=$(shell defaults read /Developer/Platforms/iPhoneOS.platform/version
207156

208157
else
209158
.cc.o:
210-
$(CXX) $(CFLAGS) $< -o $@
159+
$(CXX) $(CXXFLAGS) $< -o $@
211160

212161
.c.o:
213162
$(CC) $(CFLAGS) $< -o $@

‎build_detect_platform

Lines changed: 99 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,145 @@
11
#!/bin/sh
2-
2+
#
33
# Detects OS we're compiling on and generates build_config.mk,
44
# which in turn gets read while processing Makefile.
5-
5+
#
66
# build_config.mk will set the following variables:
7-
# - PORT_CFLAGS will either set:
8-
# -DLEVELDB_PLATFORM_POSIX if cstatomic is present
9-
# -DLEVELDB_PLATFORM_NOATOMIC if it is not
10-
# - PLATFORM_CFLAGS with compiler flags for the platform
11-
# - PLATFORM_LDFLAGS with linker flags for the platform
7+
# PLATFORM_LDFLAGS Linker flags
8+
# PLATFORM_CCFLAGS C compiler flags
9+
# PLATFORM_CXXFLAGS C++ compiler flags. Will contain:
10+
# -DLEVELDB_PLATFORM_POSIX if cstdatomic is present
11+
# -DLEVELDB_PLATFORM_NOATOMIC if it is not
12+
13+
SCRIPT_DIR=`dirname $0`
1214

1315
# Delete existing build_config.mk
1416
rm -f build_config.mk
17+
touch build_config.mk
1518

1619
if test -z "$CXX"; then
1720
CXX=g++
1821
fi
1922

2023
# Detect OS
21-
case `uname -s` in
24+
if test -z "$TARGET_OS"; then
25+
TARGET_OS=`uname -s`
26+
fi
27+
28+
COMMON_FLAGS=
29+
PLATFORM_CCFLAGS=
30+
PLATFORM_CXXFLAGS=
31+
PLATFORM_LDFLAGS=
32+
33+
# On GCC, we pick libc's memcmp over GCC's memcmp via -fno-builtin-memcmp
34+
case "$TARGET_OS" in
2235
Darwin)
2336
PLATFORM=OS_MACOSX
24-
echo "PLATFORM_CFLAGS=-DOS_MACOSX" >> build_config.mk
25-
echo "PLATFORM_LDFLAGS=" >> build_config.mk
37+
COMMON_FLAGS="-fno-builtin-memcmp -DOS_MACOSX"
38+
PORT_FILE=port/port_posix.cc
2639
;;
2740
Linux)
2841
PLATFORM=OS_LINUX
29-
echo "PLATFORM_CFLAGS=-pthread -DOS_LINUX" >> build_config.mk
30-
echo "PLATFORM_LDFLAGS=-pthread" >> build_config.mk
42+
COMMON_FLAGS="-fno-builtin-memcmp -pthread -DOS_LINUX"
43+
PLATFORM_LDFLAGS="-pthread"
44+
PORT_FILE=port/port_posix.cc
3145
;;
3246
SunOS)
3347
PLATFORM=OS_SOLARIS
34-
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_SOLARIS" >> build_config.mk
35-
echo "PLATFORM_LDFLAGS=-lpthread -lrt" >> build_config.mk
48+
COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_SOLARIS"
49+
PLATFORM_LDFLAGS="-lpthread -lrt"
50+
PORT_FILE=port/port_posix.cc
3651
;;
3752
FreeBSD)
3853
PLATFORM=OS_FREEBSD
39-
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_FREEBSD" >> build_config.mk
40-
echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk
54+
COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_FREEBSD"
55+
PLATFORM_LDFLAGS="-lpthread"
56+
PORT_FILE=port/port_posix.cc
4157
;;
4258
NetBSD)
4359
PLATFORM=OS_NETBSD
44-
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_NETBSD" >> build_config.mk
45-
echo "PLATFORM_LDFLAGS=-lpthread -lgcc_s" >> build_config.mk
60+
COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_NETBSD"
61+
PLATFORM_LDFLAGS="-lpthread -lgcc_s"
62+
PORT_FILE=port/port_posix.cc
4663
;;
4764
OpenBSD)
4865
PLATFORM=OS_OPENBSD
49-
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_OPENBSD" >> build_config.mk
50-
echo "PLATFORM_LDFLAGS=-pthread" >> build_config.mk
66+
COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_OPENBSD"
67+
PLATFORM_LDFLAGS="-pthread"
68+
PORT_FILE=port/port_posix.cc
5169
;;
5270
DragonFly)
5371
PLATFORM=OS_DRAGONFLYBSD
54-
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_DRAGONFLYBSD" >> build_config.mk
55-
echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk
72+
COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_DRAGONFLYBSD"
73+
PLATFORM_LDFLAGS="-lpthread"
74+
PORT_FILE=port/port_posix.cc
75+
;;
76+
OS_ANDROID_CROSSCOMPILE)
77+
PLATFORM="$TARGET_OS"
78+
COMMON_FLAGS=""
79+
PLATFORM_LDFLAGS=""
80+
PORT_FILE=port/port_android.cc
5681
;;
5782
*)
5883
echo "Unknown platform!"
5984
exit 1
6085
esac
6186

62-
echo "PLATFORM=$PLATFORM" >> build_config.mk
87+
# We want to make a list of all cc files within util, db, table, and helpers
88+
# except for the test and benchmark files. By default, find will output a list
89+
# of all files matching either rule, so we need to append -print to make the
90+
# prune take effect.
91+
DIRS="$SCRIPT_DIR/util $SCRIPT_DIR/db $SCRIPT_DIR/table"
92+
set -f # temporarily disable globbing so that our patterns aren't expanded
93+
PRUNE_TEST="-name *test*.cc -prune"
94+
PRUNE_BENCH="-name *_bench.cc -prune"
95+
PORTABLE_FILES=`find $DIRS $PRUNE_TEST -o $PRUNE_BENCH -o -name '*.cc' -print | sort | tr "\n" " "`
96+
set +f # re-enable globbing
6397

64-
# On GCC, use libc's memcmp, not GCC's memcmp
65-
PORT_CFLAGS="-fno-builtin-memcmp"
98+
# The sources consist of the portable files, plus the platform-specific port
99+
# file.
100+
echo "SOURCES=$PORTABLE_FILES $PORT_FILE" >> build_config.mk
101+
echo "MEMENV_SOURCES=helpers/memenv/memenv.cc" >> build_config.mk
66102

67-
# Detect C++0x -- this determines whether we'll use port_noatomic.h
68-
# or port_posix.h by:
69-
# 1. Rrying to compile with -std=c++0x and including <cstdatomic>.
70-
# 2. If $CXX returns error code, we know to use port_posix.h
71-
$CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null <<EOF
72-
#include <cstdatomic>
73-
int main() {}
74-
EOF
75-
if [ "$?" = 0 ]; then
76-
PORT_CFLAGS="$PORT_CFLAGS -DLEVELDB_PLATFORM_POSIX -DLEVELDB_CSTDATOMIC_PRESENT -std=c++0x"
103+
if [ "$PLATFORM" = "OS_ANDROID_CROSSCOMPILE" ]; then
104+
# Cross-compiling; do not try any compilation tests.
105+
true
77106
else
78-
PORT_CFLAGS="$PORT_CFLAGS -DLEVELDB_PLATFORM_POSIX"
79-
fi
107+
# If -std=c++0x works, use <cstdatomic>. Otherwise use port_posix.h.
108+
$CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null <<EOF
109+
#include <cstdatomic>
110+
int main() {}
111+
EOF
112+
if [ "$?" = 0 ]; then
113+
COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX -DLEVELDB_CSTDATOMIC_PRESENT"
114+
PLATFORM_CXXFLAGS="-std=c++0x"
115+
else
116+
COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
117+
fi
80118

81-
# Test whether Snappy library is installed
82-
# http://code.google.com/p/snappy/
83-
$CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF
84-
#include <snappy.h>
85-
int main() {}
119+
# Test whether Snappy library is installed
120+
# http://code.google.com/p/snappy/
121+
$CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF
122+
#include <snappy.h>
123+
int main() {}
86124
EOF
87-
if [ "$?" = 0 ]; then
88-
echo "SNAPPY=1" >> build_config.mk
89-
else
90-
echo "SNAPPY=0" >> build_config.mk
125+
if [ "$?" = 0 ]; then
126+
COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
127+
PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lsnappy"
128+
fi
129+
130+
# Test whether tcmalloc is available
131+
$CXX $CFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null <<EOF
132+
int main() {}
133+
EOF
134+
if [ "$?" = 0 ]; then
135+
PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -ltcmalloc"
136+
fi
91137
fi
92138

93-
echo "PORT_CFLAGS=$PORT_CFLAGS" >> build_config.mk
139+
PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
140+
PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS $COMMON_FLAGS"
141+
142+
echo "PLATFORM=$PLATFORM" >> build_config.mk
143+
echo "PLATFORM_LDFLAGS=$PLATFORM_LDFLAGS" >> build_config.mk
144+
echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> build_config.mk
145+
echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> build_config.mk

‎port/port_android.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <endian.h>
1111
#include <pthread.h>
1212
#include <stdint.h>
13-
#include <cstdatomic>
13+
#include <unistd.h>
1414
#include <string>
1515
#include <cctype>
1616

0 commit comments

Comments
 (0)