Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions build/_bootstrap_sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ esac

mkdir -p "$OUT" "$STAMPS"

# Holds "-j N" only when SDK_JOBS is set, and stays empty otherwise, so an
# unset SDK_JOBS leaves build.sh invoked exactly as before. Any -j, including
# -j 1, turns off make(1) compatibility mode.
SDK_JOBS_FLAG=""
if [ -n "${SDK_JOBS:-}" ]; then
SDK_JOBS_FLAG="-j $SDK_JOBS"
fi

clean_magic_cache() {
magic_root="$SRC/external/bsd/file/dist/magic"
if [ -d "$magic_root" ]; then
Expand All @@ -44,10 +52,11 @@ run_tools() {
rm -f "$TOOLS_STAMP"
clean_magic_cache
cd "$SRC"
# shellcheck disable=SC2086
env HOST_CC="$HOST_CC" HOST_CXX="$HOST_CXX" \
HOST_CFLAGS="$HOST_CFLAGS" HOST_CXXFLAGS="$HOST_CXXFLAGS" \
HOST_CPPFLAGS="$HOST_CPPFLAGS" \
./build.sh -U -m "$BUILD_MACHINE" -a "$BUILD_MACHINE_ARCH" \
./build.sh -U $SDK_JOBS_FLAG -m "$BUILD_MACHINE" -a "$BUILD_MACHINE_ARCH" \
-V NO_PTHREADS="$NO_PTHREADS" \
-O "$OBJ" -T "$TOOLS" tools \
>"$TOOLS_LOG" 2>&1
Expand All @@ -64,10 +73,11 @@ run_distribution() {
rm -f "$DIST_STAMP"
clean_magic_cache
cd "$SRC"
# shellcheck disable=SC2086
env HOST_CC="$HOST_CC" HOST_CXX="$HOST_CXX" \
HOST_CFLAGS="$HOST_CFLAGS" HOST_CXXFLAGS="$HOST_CXXFLAGS" \
HOST_CPPFLAGS="$HOST_CPPFLAGS" \
./build.sh -U -m "$BUILD_MACHINE" -a "$BUILD_MACHINE_ARCH" \
./build.sh -U $SDK_JOBS_FLAG -m "$BUILD_MACHINE" -a "$BUILD_MACHINE_ARCH" \
-V NO_PTHREADS="$NO_PTHREADS" \
-O "$OBJ" -T "$TOOLS" distribution \
>"$DIST_LOG" 2>&1
Expand Down
7 changes: 6 additions & 1 deletion build/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ HOST_CXXFLAGS="${HOST_CXXFLAGS:--O -fcommon -fgnu89-inline}"
HOST_CPPFLAGS="${HOST_CPPFLAGS:--D__GNUC_GNU_INLINE__ -D__STDC_WANT_LIB_EXT1__=1}"
NO_PTHREADS="${NO_PTHREADS:-1}"

# Unset by default: any -j, including -j 1, turns off make(1) compatibility
# mode, which changes how target commands are run. Leaving this empty keeps
# build.sh invoked exactly as before.
SDK_JOBS="${SDK_JOBS:-}"

SAMBA4_VERSION="${SAMBA4_VERSION:-4.8.12}"
SAMBA4_GIT_URL="${SAMBA4_GIT_URL:-https://github.com/samba-team/samba.git}"
SAMBA4_GIT_REF="${SAMBA4_GIT_REF:-samba-${SAMBA4_VERSION}}"
Expand Down Expand Up @@ -582,7 +587,7 @@ export NETBSD7_ROOT NETBSD7_SRC NETBSD7_OUT NETBSD7_DOWNLOAD_LOG NETBSD7_TOOLS_L
export BUILD_TARGET BUILD_ROOT BUILD_SRC BUILD_OUT BUILD_MACHINE BUILD_MACHINE_ARCH
export SDK_DOWNLOAD_WRAPPER SDK_BOOTSTRAP_WRAPPER
export SRC OUT OBJ TOOLS STAMPS TOOLS_STAMP DIST_STAMP MKCONF
export HOST_CC HOST_CXX HOST_CFLAGS HOST_CXXFLAGS HOST_CPPFLAGS NO_PTHREADS
export HOST_CC HOST_CXX HOST_CFLAGS HOST_CXXFLAGS HOST_CPPFLAGS NO_PTHREADS SDK_JOBS
export DOWNLOAD_LOG TOOLS_LOG DIST_LOG HELLO_LOG PROBE_DIR PROBE_SRC PROBE_BIN DIRPROBE_LOG
export MDNS_STAGE NBNS_STAGE MDNS_LOG NBNS_LOG MDNS_BIN_NAME NBNS_BIN_NAME CROSS_EXEC_REMOTE_DIR
export BUILD_EXPECT_OS_RELEASE BUILD_EXPECT_HOST_ALIAS BUILD_EXPECT_EABI BUILD_EXPECT_ENDIAN BUILD_EXPECT_TOOL_TRIPLE_GLOB
Expand Down
Loading