main.scons - Issue 8587046: Bypassing windows build path on windows32

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: main.scons

Issue 8587046: Bypassing windows build path on windows32 Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 9 years, 1 month ago

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

Jump to:

Index: main.scons

diff --git a/main.scons b/main.scons

index 437aea449d8dea5a768d769c65b573df7bc47090..86cda2f755a4d697afa940856bb3804fa0fc157d 100644

--- a/main.scons

+++ b/main.scons

@@ -101,7 +101,9 @@ base_env = Environment(

build_utils.NormalizeToolchain(arch='x86', variant='glibc'),

ROOT_DIR = os.path.abspath(os.getcwd()),

- IS_WINDOWS = sys.platform in ['cygwin', 'win32'],

+ IS_WINDOWS = (sys.platform in ['cygwin', 'win32'] and

+ '64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or

+ '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')),

IS_LINUX = sys.platform == 'linux2',

IS_MAC = sys.platform == 'darwin',

JOB_COUNT = GetOption('num_jobs')

« no previous file with comments | « no previous file | no next file » | no next file with comments »