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

Side by Side Diff: SConstruct

Issue 6106014: Revert accidental part of http://codereview.chromium.org/6123007/... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 11 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 # Copyright 2010 the V8 project authors. All rights reserved. 1 # Copyright 2010 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 '-mthumb-interwork', 65 '-mthumb-interwork',
66 '-funwind-tables', 66 '-funwind-tables',
67 '-fstack-protector', 67 '-fstack-protector',
68 '-fno-short-enums', 68 '-fno-short-enums',
69 '-fmessage-length=0', 69 '-fmessage-length=0',
70 '-finline-functions', 70 '-finline-functions',
71 '-fno-inline-functions-called-once', 71 '-fno-inline-functions-called-once',
72 '-fgcse-after-reload', 72 '-fgcse-after-reload',
73 '-frerun-cse-after-loop', 73 '-frerun-cse-after-loop',
74 '-frename-registers', 74 '-frename-registers',
75 '-fomit-frame-pointer',
75 '-finline-limit=64', 76 '-finline-limit=64',
76 '-DCAN_USE_VFP_INSTRUCTIONS=1', 77 '-DCAN_USE_VFP_INSTRUCTIONS=1',
77 '-DCAN_USE_ARMV7_INSTRUCTIONS=1', 78 '-DCAN_USE_ARMV7_INSTRUCTIONS=1',
78 '-DCAN_USE_UNALIGNED_ACCESSES=1', 79 '-DCAN_USE_UNALIGNED_ACCESSES=1',
79 '-MD'] 80 '-MD']
80 81
81 ANDROID_INCLUDES = [ANDROID_TOP + '/bionic/libc/arch-arm/include', 82 ANDROID_INCLUDES = [ANDROID_TOP + '/bionic/libc/arch-arm/include',
82 ANDROID_TOP + '/bionic/libc/include', 83 ANDROID_TOP + '/bionic/libc/include',
83 ANDROID_TOP + '/bionic/libstdc++/include', 84 ANDROID_TOP + '/bionic/libstdc++/include',
84 ANDROID_TOP + '/bionic/libc/kernel/common', 85 ANDROID_TOP + '/bionic/libc/kernel/common',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'CXXFLAGS': ['-fvisibility=hidden'] 136 'CXXFLAGS': ['-fvisibility=hidden']
136 }, 137 },
137 'mode:debug': { 138 'mode:debug': {
138 'CCFLAGS': ['-g', '-O0'], 139 'CCFLAGS': ['-g', '-O0'],
139 'CPPDEFINES': ['ENABLE_DISASSEMBLER', 'DEBUG'], 140 'CPPDEFINES': ['ENABLE_DISASSEMBLER', 'DEBUG'],
140 'os:android': { 141 'os:android': {
141 'CCFLAGS': ['-mthumb'] 142 'CCFLAGS': ['-mthumb']
142 } 143 }
143 }, 144 },
144 'mode:release': { 145 'mode:release': {
145 'CCFLAGS': ['-O2', '-fdata-sections', 146 'CCFLAGS': ['-O3', '-fomit-frame-pointer', '-fdata-sections',
146 '-ffunction-sections'], 147 '-ffunction-sections'],
147 'os:android': { 148 'os:android': {
148 'CCFLAGS': ['-mthumb'], 149 'CCFLAGS': ['-mthumb', '-Os'],
149 'CPPDEFINES': ['SK_RELEASE', 'NDEBUG'] 150 'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
150 } 151 }
151 }, 152 },
152 'os:linux': { 153 'os:linux': {
153 'CCFLAGS': ['-ansi'] + GCC_EXTRA_CCFLAGS, 154 'CCFLAGS': ['-ansi'] + GCC_EXTRA_CCFLAGS,
154 'library:shared': { 155 'library:shared': {
155 'CPPDEFINES': ['V8_SHARED'], 156 'CPPDEFINES': ['V8_SHARED'],
156 'LIBS': ['pthread'] 157 'LIBS': ['pthread']
157 } 158 }
158 }, 159 },
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 # version of scons. Also, there's a bug in some revisions that 1158 # version of scons. Also, there's a bug in some revisions that
1158 # doesn't allow this flag to be set, so we swallow any exceptions. 1159 # doesn't allow this flag to be set, so we swallow any exceptions.
1159 # Lovely. 1160 # Lovely.
1160 try: 1161 try:
1161 SetOption('warn', 'no-deprecated') 1162 SetOption('warn', 'no-deprecated')
1162 except: 1163 except:
1163 pass 1164 pass
1164 1165
1165 1166
1166 Build() 1167 Build()
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