.
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,6 +1,8 @@
|
|||||||
# Build directories
|
# Build directories
|
||||||
build/
|
build/
|
||||||
cmake-build-*/
|
cmake-build-*/
|
||||||
|
build-*/
|
||||||
|
|
||||||
|
|
||||||
# CMake generated files
|
# CMake generated files
|
||||||
CMakeCache.txt
|
CMakeCache.txt
|
||||||
|
@@ -7,7 +7,6 @@ set -e
|
|||||||
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
||||||
CACHE_DIR="${SCRIPT_DIR}/cache"
|
CACHE_DIR="${SCRIPT_DIR}/cache"
|
||||||
EXE_DIR="${SCRIPT_DIR}/exe"
|
EXE_DIR="${SCRIPT_DIR}/exe"
|
||||||
BUILD_DIR="${SCRIPT_DIR}/build"
|
|
||||||
|
|
||||||
# FUNCTIONS
|
# FUNCTIONS
|
||||||
function title() {
|
function title() {
|
||||||
@@ -31,7 +30,8 @@ function die() {
|
|||||||
function build() {
|
function build() {
|
||||||
ARCH=$1
|
ARCH=$1
|
||||||
|
|
||||||
BUILD_DIR="${SCRIPT_DIR}/build-${ARCH}"
|
BUILD_NAME="build-${ARCH}"
|
||||||
|
BUILD_DIR="${SCRIPT_DIR}/${BUILD_NAME}"
|
||||||
mkdir -p ${BUILD_DIR}
|
mkdir -p ${BUILD_DIR}
|
||||||
|
|
||||||
DOCKCROSS_SCRIPT="${CACHE_DIR}/dockcross-${ARCH}"
|
DOCKCROSS_SCRIPT="${CACHE_DIR}/dockcross-${ARCH}"
|
||||||
@@ -44,7 +44,7 @@ function build() {
|
|||||||
|
|
||||||
echo "Building $ARCH executable"
|
echo "Building $ARCH executable"
|
||||||
cd "${SCRIPT_DIR}"
|
cd "${SCRIPT_DIR}"
|
||||||
"${DOCKCROSS_SCRIPT}" bash -c "cd ${BUILD_DIR} && cmake .. && make -j$(nproc)"
|
"${DOCKCROSS_SCRIPT}" bash -c "cd ${BUILD_NAME} && cmake .. && make -j$(nproc)"
|
||||||
|
|
||||||
if [ ! -f ${BUILD_DIR}/simple_object_storage ]; then
|
if [ ! -f ${BUILD_DIR}/simple_object_storage ]; then
|
||||||
die "Failed to build $ARCH executable"
|
die "Failed to build $ARCH executable"
|
||||||
|
Reference in New Issue
Block a user