tools/Makefile - Issue 245733002: Added arguments to NaCl scons to allow custom toolchain directories.

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: tools/Makefile

Issue 245733002: Added arguments to NaCl scons to allow custom toolchain directories. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: Use abspath of environment instead of cwd since cwd can change per test Created 6 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: tools/Makefile

diff --git a/tools/Makefile b/tools/Makefile

index df922ac047476ef944963568ae414639e281ec1d..11998fdbf81157e307b5aa8daf56a042b049a8bd 100644

--- a/tools/Makefile

+++ b/tools/Makefile

@@ -867,7 +867,7 @@ gdb: BUILD/stamp-$(CROSSARCH)-gdb

.PHONY: headers_for_build

headers_for_build:

cd .. && \

- ./$(SCONS) naclsdk_mode=custom:$(PREFIX_NATIVE) \

+ ./$(SCONS) nacl_newlib_dir=$(PREFIX_NATIVE) \

--verbose platform=x86-$(BITSPLATFORM) \

install_headers includedir=$(HEADERS_FOR_BUILD_NATIVE)

@@ -1053,14 +1053,14 @@ DEJAGNU_TIMESTAMP := $(shell date +%y%m%d%H%M%S)

.PHONY: $(SEL_LDR)

$(SEL_LDR):

(cd .. && \

- ./$(SCONS) naclsdk_mode=custom:$(DESTDIR)$(PREFIX) \

+ ./$(SCONS) nacl_glibc_dir=$(DESTDIR)$(PREFIX) \

--mode=opt-host,nacl platform=x86-$(BITSPLATFORM) \

--verbose sel_ldr)

.PHONY: check

check: $(SEL_LDR)

(cd .. && \

- ./$(SCONS) naclsdk_mode=custom:$(DESTDIR)$(PREFIX) \

+ ./$(SCONS) nacl_glibc_dir=$(DESTDIR)$(PREFIX) \

--mode=opt-host,nacl platform=x86-$(BITSPLATFORM) \

--verbose run_hello_world_test)

mkdir BUILD/build-gcc-$(CROSSARCH)/results.$(DEJAGNU_TIMESTAMP)

« no previous file with comments | « tests/gdb/nacl.scons ('k') | no next file » | no next file with comments »