pnacl/build.sh - Issue 8391032: Part 2 of 3: Moving tools/llvm to pnacl/

Unified Diff: pnacl/build.sh

Issue 8391032: Part 2 of 3: Moving tools/llvm to pnacl/ (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/

Patch Set: '' Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pnacl/build.sh

===================================================================

--- pnacl/build.sh (revision 7025)

+++ pnacl/build.sh (working copy)

@@ -24,32 +24,33 @@

set -o nounset

set -o errexit

-# The script is located in "native_client/tools/llvm".

+# The script is located in "native_client/pnacl".

# Set pwd to native_client/

-cd "$(dirname "$0")"/../..

+cd "$(dirname "$0")"/..

if [[ $(basename "$(pwd)") != "native_client" ]] ; then

echo "ERROR: cannot find native_client/ directory"

exit -1

+source pnacl/scripts/common-tools.sh

readonly NACL_ROOT="$(pwd)"

-source tools/llvm/common-tools.sh

-SetScriptPath "${NACL_ROOT}/tools/llvm/utman.sh"

+SetScriptPath "${NACL_ROOT}/pnacl/build.sh"

SetLogDirectory "${NACL_ROOT}/toolchain/hg-log"

# NOTE: gcc and llvm have to be synchronized

# we have chosen toolchains which both are based on gcc-4.2.1

# For different levels of make parallelism change this in your env

-readonly UTMAN_CONCURRENCY=${UTMAN_CONCURRENCY:-8}

-readonly UTMAN_MERGE_TESTING=${UTMAN_MERGE_TESTING:-false}

-UTMAN_PRUNE=${UTMAN_PRUNE:-false}

-UTMAN_BUILD_ARM=true

+readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8}

+readonly PNACL_MERGE_TESTING=${PNACL_MERGE_TESTING:-false}

+PNACL_PRUNE=${PNACL_PRUNE:-false}

+PNACL_BUILD_ARM=true

if ${BUILD_PLATFORM_MAC} || ${BUILD_PLATFORM_WIN}; then

# We don't yet support building ARM tools for mac or windows.

- UTMAN_BUILD_ARM=false

+ PNACL_BUILD_ARM=false

# Set the library mode

@@ -61,7 +62,7 @@

LIBMODE_NEWLIB=true

elif [ ${LIBMODE} == "glibc" ]; then

LIBMODE_GLIBC=true

- UTMAN_BUILD_ARM=false

+ PNACL_BUILD_ARM=false

else

Fatal "Unknown library mode ${LIBMODE}"

@@ -85,7 +86,7 @@

readonly NNACL_NEWLIB_ROOT="${NNACL_BASE}_newlib"

readonly NNACL_GLIBC_ROOT="${NNACL_BASE}"

-readonly MAKE_OPTS="-j${UTMAN_CONCURRENCY} VERBOSE=1"

+readonly MAKE_OPTS="-j${PNACL_CONCURRENCY} VERBOSE=1"

readonly NONEXISTENT_PATH="/going/down/the/longest/road/to/nowhere"

@@ -443,7 +444,7 @@

" (you may need to resolve conflicts) " \

" " \

" If your repository is ahead of stable, then modify: " \

- " ${defstr}_REV (in tools/llvm/utman.sh) " \

+ " ${defstr}_REV (in pnacl/build.sh) " \

" to suppress this error message. "

exit -1

}

@@ -474,7 +475,7 @@

" (you may need to resolve conflicts) " \

" " \

" If your repository is ahead of stable, then modify: " \

- " ${defstr}_REV (in tools/llvm/utman.sh) " \

+ " ${defstr}_REV (in pnacl/build.sh) " \

" to suppress this error message. "

exit -1

}

@@ -483,7 +484,7 @@

local name="$1"

local dir="$2"

- if ! ${UTMAN_BUILDBOT} ; then

+ if ! ${PNACL_BUILDBOT} ; then

return 0

@@ -501,7 +502,7 @@

local name="$1"

local dir="$2"

- if ! ${UTMAN_BUILDBOT} ; then

+ if ! ${PNACL_BUILDBOT} ; then

return 0

@@ -556,7 +557,7 @@

hg-update-upstream() {

llvm-unlink-clang

- if ! ${UTMAN_MERGE_TESTING} ; then

+ if ! ${PNACL_MERGE_TESTING} ; then

hg-update-common "upstream" ${UPSTREAM_REV} "${TC_SRC_UPSTREAM}"

llvm-link-clang

@@ -656,7 +657,7 @@

}

hg-checkout-upstream() {

- if ! ${UTMAN_MERGE_TESTING} ; then

+ if ! ${PNACL_MERGE_TESTING} ; then

hg-checkout ${REPO_UPSTREAM} "${TC_SRC_UPSTREAM}" ${UPSTREAM_REV}

llvm-link-clang

@@ -820,7 +821,7 @@

#@ everything - Checkout everything from the repositories

everything-hg() {

mkdir -p "${INSTALL_ROOT}"

- if ${UTMAN_IN_CROS_CHROOT}; then

+ if ${PNACL_IN_CROS_CHROOT}; then

# TODO: http://code.google.com/p/nativeclient/issues/detail?id=2295

Banner "You are running in a ChromiumOS Chroot." \

" You should make sure that the PNaCl sources are properly checked out " \

@@ -862,12 +863,12 @@

everything

# Building the sandboxed tools requires the SDK

- if ${UTMAN_PRUNE}; then

+ if ${PNACL_PRUNE}; then

prune

sdk

install-translators srpc

- if ${UTMAN_PRUNE}; then

+ if ${PNACL_PRUNE}; then

prune-translator-install srpc

track-translator-size ${SBTC_BUILD_WITH_PNACL}

@@ -1062,7 +1063,7 @@

# Remove the SDK so it doesn't end up in the tarball

sdk-clean

- if ${UTMAN_PRUNE}; then

+ if ${PNACL_PRUNE}; then

prune

tarball $1

@@ -1868,7 +1869,7 @@

mkdir -p "${arch}"

spushd "${arch}"

RunWithLog libgcc.${arch}.make \

- make -j ${UTMAN_CONCURRENCY} -f ${src}/Makefile-pnacl libgcc.a \

+ make -j ${PNACL_CONCURRENCY} -f ${src}/Makefile-pnacl libgcc.a \

CC="${PNACL_CC}" \

AR="${PNACL_AR}" \

"SRC_DIR=${src}" \

@@ -2016,7 +2017,7 @@

#+ misc-tools - Build and install sel_ldr and validator for ARM.

misc-tools() {

- if ${UTMAN_BUILD_ARM} ; then

+ if ${PNACL_BUILD_ARM} ; then

StepBanner "MISC-ARM" "Building sel_ldr (ARM)"

# TODO(robertm): revisit some of these options

@@ -2639,7 +2640,7 @@

StepBanner "GOOGLE-PERFTOOLS" "Make"

ts-touch-open "${objdir}"

RunWithLog google-perftools.make \

- make -j ${UTMAN_CONCURRENCY}

+ make -j ${PNACL_CONCURRENCY}

ts-touch-commit "${objdir}"

spopd

}

@@ -3169,7 +3170,7 @@

#########################################################################

SCONS_COMMON=(./scons

MODE=nacl

- -j${UTMAN_CONCURRENCY}

+ -j${PNACL_CONCURRENCY}

bitcode=1

sdl=none

disable_nosys_linker_warnings=1

@@ -3314,10 +3315,10 @@

echo "* src/trusted/service_runtime/include *"

echo "* *"

echo "* To destroy the local changes to newlib, run: *"

- echo "* tools/llvm/utman.sh newlib-nacl-headers-clean *"

+ echo "* pnacl/build.sh newlib-nacl-headers-clean *"

echo "*******************************************************************"

echo ""

- if ${UTMAN_BUILDBOT} ; then

+ if ${PNACL_BUILDBOT} ; then

newlib-nacl-headers-clean

else

exit -1

@@ -3710,14 +3711,14 @@

#@ show-config

show-config() {

Banner "Config Settings:"

- echo "UTMAN_BUILDBOT: ${UTMAN_BUILDBOT}"

- echo "UTMAN_CONCURRENCY: ${UTMAN_CONCURRENCY}"

- echo "UTMAN_DEBUG: ${UTMAN_DEBUG}"

- echo "UTMAN_PRUNE: ${UTMAN_PRUNE}"

- echo "UTMAN_VERBOSE: ${UTMAN_VERBOSE}"

+ echo "PNACL_BUILDBOT: ${PNACL_BUILDBOT}"

+ echo "PNACL_CONCURRENCY: ${PNACL_CONCURRENCY}"

+ echo "PNACL_DEBUG: ${PNACL_DEBUG}"

+ echo "PNACL_PRUNE: ${PNACL_PRUNE}"

+ echo "PNACL_VERBOSE: ${PNACL_VERBOSE}"

echo "LIBMODE: ${LIBMODE}"

Banner "Your Environment:"

- env | grep UTMAN

+ env | grep PNACL

}

#@ help - Usage information.

@@ -3731,7 +3732,7 @@

}

has-trusted-toolchain() {

- if [ -f toolchain/linux_arm-trusted/ld_script_arm_trusted ]; then

+ if [ -f ${NACL_ROOT}/toolchain/linux_arm-trusted/ld_script_arm_trusted ]; then

return 0

else

return 1

@@ -3739,7 +3740,7 @@

}

check-for-trusted() {

- if ! ${UTMAN_BUILD_ARM} ; then

+ if ! ${PNACL_BUILD_ARM} ; then

return

@@ -3750,7 +3751,7 @@

echo '* *'

echo '* To download and install the trusted toolchain, run: *'

echo '* *'

- echo '* $ tools/llvm/utman.sh download-trusted *'

+ echo '* $ pnacl/build.sh download-trusted *'

echo '* *'

echo '* To compile the trusted toolchain, use: *'

echo '* *'

@@ -3759,12 +3760,12 @@

echo '*******************************************************************'

# If building on the bots, do not continue since it needs to run ARM tests.

- if ${UTMAN_BUILDBOT} ; then

+ if ${PNACL_BUILDBOT} ; then

echo "Building on bots --> need ARM trusted toolchain to run tests!"

exit -1

elif trusted-tc-confirm ; then

echo "Continuing without ARM trusted toolchain"

- UTMAN_BUILD_ARM=false

+ PNACL_BUILD_ARM=false

else

echo "Okay, stopping."

exit -1

@@ -3781,7 +3782,7 @@

}

DebugRun() {

- if ${UTMAN_DEBUG} || ${UTMAN_BUILDBOT}; then

+ if ${PNACL_DEBUG} || ${PNACL_BUILDBOT}; then

"$@"

}

« no previous file with comments | « buildbot/buildbot_toolchain_arm_untrusted.sh ('k') | pnacl/build-glibc.sh » ('j') | no next file with comments »