Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2915)

Side by Side Diff: native_client_sdk/src/build_tools/make_rules.py

Issue 10820058: Fix bad merge in a244177 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 6
7 # 7 #
8 # Default macros for various platforms. 8 # Default macros for various platforms.
9 # 9 #
10 NEWLIB_DEFAULTS = """ 10 NEWLIB_DEFAULTS = """
(...skipping 14 matching lines...) Expand all
25 GLIBC_PATHS+=-L $(TC_PATH)/$(OSNAME)_x86_glibc/x86_64-nacl/lib 25 GLIBC_PATHS+=-L $(TC_PATH)/$(OSNAME)_x86_glibc/x86_64-nacl/lib
26 GLIBC_CCFLAGS?=-O0 -MMD -g -pthread $(NACL_WARNINGS) 26 GLIBC_CCFLAGS?=-O0 -MMD -g -pthread $(NACL_WARNINGS)
27 GLIBC_LDFLAGS?=-g -pthread 27 GLIBC_LDFLAGS?=-g -pthread
28 """ 28 """
29 29
30 PNACL_DEFAULTS = """ 30 PNACL_DEFAULTS = """
31 PNACL_CC?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang -c 31 PNACL_CC?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang -c
32 PNACL_CXX?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++ -c -std=gnu++ 98 32 PNACL_CXX?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++ -c -std=gnu++ 98
33 PNACL_LINK?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++ 33 PNACL_LINK?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++
34 PNACL_DUMP?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/objdump 34 PNACL_DUMP?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/objdump
35 PNACL_CCFLAGS?=-O0 -g -pthread $(NACL_WARNINGS)
36 PNACL_CCFLAGS?=-O0 -MMD -g -pthread $(NACL_WARNINGS) 35 PNACL_CCFLAGS?=-O0 -MMD -g -pthread $(NACL_WARNINGS)
36 PNACL_LDFLAGS?=-g -pthread
37 TRANSLATE:=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-translate 37 TRANSLATE:=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-translate
38 """ 38 """
39 39
40 WIN_DEFAULTS = """ 40 WIN_DEFAULTS = """
41 WIN_CC?=cl.exe 41 WIN_CC?=cl.exe
42 WIN_CXX?=cl.exe 42 WIN_CXX?=cl.exe
43 WIN_LINK?=link.exe 43 WIN_LINK?=link.exe
44 WIN_LIB?=lib.exe 44 WIN_LIB?=lib.exe
45 WIN_CCFLAGS=/I$(NACL_SDK_ROOT)/include /I$(NACL_SDK_ROOT)/include/win -D WIN32 - D _WIN32 45 WIN_CCFLAGS=/I$(NACL_SDK_ROOT)/include /I$(NACL_SDK_ROOT)/include/win -D WIN32 - D _WIN32
46 WIN_LDFLAGS=/LIBPATH:$(NACL_SDK_ROOT)/lib/win_x86_32_host 46 WIN_LDFLAGS=/LIBPATH:$(NACL_SDK_ROOT)/lib/win_x86_32_host
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 for key in kwargs: 274 for key in kwargs:
275 replace['<%s>' % key] = kwargs[key] 275 replace['<%s>' % key] = kwargs[key]
276 276
277 if '<OBJS>' not in replace: 277 if '<OBJS>' not in replace:
278 if replace.get('<ARCH>', ''): 278 if replace.get('<ARCH>', ''):
279 replace['<OBJS>'] = '%s_%s_%s_%s_O' % (TC, PROJ, replace['<ARCH>'], EXT) 279 replace['<OBJS>'] = '%s_%s_%s_%s_O' % (TC, PROJ, replace['<ARCH>'], EXT)
280 else: 280 else:
281 replace['<OBJS>'] = '%s_%s_%s_O' % (TC, PROJ, EXT) 281 replace['<OBJS>'] = '%s_%s_%s_O' % (TC, PROJ, EXT)
282 return replace 282 return replace
283 283
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698