pnacl/build.sh - Issue 8776023: Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pnacl/build.sh

Issue 8776023: Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: disable pnacl_example_browser for x86-64 until shim updated Created 9 years 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

diff --git a/pnacl/build.sh b/pnacl/build.sh

index 585d93006e57b608947ed17adc56365656211516..8b5939eecf00f8da338cd92e14e842527965b37d 100755

--- a/pnacl/build.sh

+++ b/pnacl/build.sh

@@ -3048,13 +3048,17 @@ sdk-irt-shim() {

# the pnacl toolchain to depend on it.

StepBanner "SDK" "IRT Shim"

spushd "${NACL_ROOT}"

+ # NOTE: We specify bitcode=1, but it is really using nacl-gcc to build

+ # the library (it's only bitcode=1 because it's part of the pnacl sdk).

RunWithLog "sdk.irt.shim" \

./scons -j${PNACL_CONCURRENCY} \

+ bitcode=1 \

platform=x86-64 \

naclsdk_validate=0 \

--verbose \

pnacl_irt_shim

- local outdir="${SCONS_OUT}"/nacl-x86-64/obj/src/untrusted/pnacl_irt_shim

+ local out_dir_prefix="${SCONS_OUT}"/nacl-x86-64-pnacl-clang

+ local outdir="${out_dir_prefix}"/obj/src/untrusted/pnacl_irt_shim

mkdir -p "${INSTALL_LIB_X8664}"

cp "${outdir}"/libpnacl_irt_shim.a "${INSTALL_LIB_X8664}"

spopd

« no previous file with comments | « SConstruct ('k') | site_scons/site_tools/naclsdk.py » ('j') | no next file with comments »