pnacl/build.sh - Issue 1082953002: Add configure/CMake flags for conditionally building subzero targets.

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 1082953002: Add configure/CMake flags for conditionally building subzero targets. (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master

Patch Set: Update LLVM too Created 5 years, 8 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

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

index 904a181f4b961cdf19656d0bcafbecfbbe332e56..25fef2276b1a41045dbf2a0fa1ddbde20930702f 100755

--- a/pnacl/build.sh

+++ b/pnacl/build.sh

@@ -304,12 +304,25 @@ llvm-sb-configure() {

local objdir="${LLVM_SB_OBJDIR}"

local installdir="$(GetTranslatorInstallDir ${arch})"

local targets=""

+ local subzero_targets=""

# For LLVM, "x86" brings in both i686 and x86_64.

case ${arch} in

- i686) targets=x86 ;;

- x86_64) targets=x86 ;;

- armv7) targets=arm ;;

- universal) targets=x86,arm ;;

+ i686)

+ targets=x86

+ subzero_targets=X8632

+ ;;

+ x86_64)

+ targets=x86

+ subzero_targets=X8664

+ ;;

+ armv7)

+ targets=arm

+ subzero_targets=ARM32

+ ;;

+ universal)

+ targets=x86,arm

+ subzero_targets=X8632,ARM32

+ ;;

esac

spushd "${objdir}"

@@ -328,6 +341,7 @@ llvm-sb-configure() {

--prefix=${installdir} \

--host=nacl \

--enable-targets=${targets} \

+ --enable-subzero-targets=${subzero_targets} \

--disable-assertions \

--enable-pic=no \

--enable-static \

« no previous file with comments | « pnacl/COMPONENT_REVISIONS ('k') | toolchain_build/toolchain_build_pnacl.py » ('j') | no next file with comments »