andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some small improvements to the build_tools

Browse Source 
Summary: Closes https://github.com/facebook/rocksdb/pull/3664

Differential Revision: D7459433

Pulled By: sagar0

fbshipit-source-id: 3817e5d45fc70e83cb26f9800eaa0f4566c8dc0e
This commit is contained in:
Adam Retter 2018-04-02 23:45:39 -07:00 committed by Facebook Github Bot
parent 04c11b867d
commit 12b400e814
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build_tools/build_detect_platform
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/env bash
# #
# Detects OS we're compiling on and outputs a file specified by the first # Detects OS we're compiling on and outputs a file specified by the first
# argument, which in turn gets read while processing Makefile. # argument, which in turn gets read while processing Makefile.
@ -66,11 +66,23 @@ rm -f "$OUTPUT"
touch "$OUTPUT" touch "$OUTPUT"
if test -z "$CC"; then if test -z "$CC"; then
CC=cc if [ -x "$(command -v cc)" ]; then
CC=cc
elif [ -x "$(command -v clang)" ]; then
CC=clang
else
CC=cc
fi
fi fi
if test -z "$CXX"; then if test -z "$CXX"; then
CXX=g++ if [ -x "$(command -v g++)" ]; then
CXX=g++
elif [ -x "$(command -v clang++)" ]; then
CXX=clang++
else
CXX=g++
fi
fi fi
# Detect OS # Detect OS
@ -87,7 +99,7 @@ if test -z "$CLANG_SCAN_BUILD"; then
fi fi
if test -z "$CLANG_ANALYZER"; then if test -z "$CLANG_ANALYZER"; then
CLANG_ANALYZER=$(which clang++ 2> /dev/null) CLANG_ANALYZER=$(command -v clang++ 2> /dev/null)
fi fi
if test -z "$FIND"; then if test -z "$FIND"; then
@ -498,9 +510,9 @@ if test -z "$PORTABLE"; then
elif test -n "`echo $TARGET_ARCHITECTURE | grep ^arm`"; then elif test -n "`echo $TARGET_ARCHITECTURE | grep ^arm`"; then
# TODO: Handle this with approprite options. # TODO: Handle this with approprite options.
COMMON_FLAGS="$COMMON_FLAGS" COMMON_FLAGS="$COMMON_FLAGS"
elif [ "$TARGET_OS" == IOS ]; then elif [ "$TARGET_OS" == "IOS" ]; then
COMMON_FLAGS="$COMMON_FLAGS" COMMON_FLAGS="$COMMON_FLAGS"
elif [ "$TARGET_OS" != AIX ] && [ "$TARGET_OS" != SunOS ]; then elif [ "$TARGET_OS" != "AIX" ] && [ "$TARGET_OS" != "SunOS" ]; then
COMMON_FLAGS="$COMMON_FLAGS -march=native " COMMON_FLAGS="$COMMON_FLAGS -march=native "
elif test "$USE_SSE"; then elif test "$USE_SSE"; then
COMMON_FLAGS="$COMMON_FLAGS -msse4.2 -mpclmul" COMMON_FLAGS="$COMMON_FLAGS -msse4.2 -mpclmul"

2
build_tools/version.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/env bash
if [ "$#" = "0" ]; then if [ "$#" = "0" ]; then
echo "Usage: $0 major|minor|patch|full" echo "Usage: $0 major|minor|patch|full"
exit 1 exit 1