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

Side by Side Diff: SConstruct

Issue 100175: Added architecture properties to Windows Scons build. (Closed)
Patch Set: Removed ARM defines and fix test-code to not expect it.wq Created 11 years, 7 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
« no previous file with comments | « no previous file | test/cctest/test-regexp.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2008 the V8 project authors. All rights reserved. 1 # Copyright 2008 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 'all': { 165 'all': {
166 'DIALECTFLAGS': ['/nologo'], 166 'DIALECTFLAGS': ['/nologo'],
167 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'], 167 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'],
168 'CXXFLAGS': ['$CCFLAGS', '/GR-', '/Gy'], 168 'CXXFLAGS': ['$CCFLAGS', '/GR-', '/Gy'],
169 'CPPDEFINES': ['WIN32', '_USE_32BIT_TIME_T'], 169 'CPPDEFINES': ['WIN32', '_USE_32BIT_TIME_T'],
170 'LINKFLAGS': ['/NOLOGO', '/MACHINE:X86', '/INCREMENTAL:NO', 170 'LINKFLAGS': ['/NOLOGO', '/MACHINE:X86', '/INCREMENTAL:NO',
171 '/NXCOMPAT', '/IGNORE:4221'], 171 '/NXCOMPAT', '/IGNORE:4221'],
172 'ARFLAGS': ['/NOLOGO'], 172 'ARFLAGS': ['/NOLOGO'],
173 'CCPDBFLAGS': ['/Zi'] 173 'CCPDBFLAGS': ['/Zi']
174 }, 174 },
175 'arch:ia32': {
176 'CPPDEFINES': ['V8_ARCH_IA32']
177 },
175 'mode:debug': { 178 'mode:debug': {
176 'CCFLAGS': ['/Od', '/Gm'], 179 'CCFLAGS': ['/Od', '/Gm'],
177 'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'], 180 'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'],
178 'LINKFLAGS': ['/DEBUG'], 181 'LINKFLAGS': ['/DEBUG'],
179 'msvcrt:static': { 182 'msvcrt:static': {
180 'CCFLAGS': ['/MTd'] 183 'CCFLAGS': ['/MTd']
181 }, 184 },
182 'msvcrt:shared': { 185 'msvcrt:shared': {
183 'CCFLAGS': ['/MDd'] 186 'CCFLAGS': ['/MDd']
184 } 187 }
(...skipping 17 matching lines...) Expand all
202 } 205 }
203 206
204 207
205 V8_EXTRA_FLAGS = { 208 V8_EXTRA_FLAGS = {
206 'gcc': { 209 'gcc': {
207 'all': { 210 'all': {
208 'CXXFLAGS': [], #['-fvisibility=hidden'], 211 'CXXFLAGS': [], #['-fvisibility=hidden'],
209 'WARNINGFLAGS': ['-Wall', '-Werror', '-W', 212 'WARNINGFLAGS': ['-Wall', '-Werror', '-W',
210 '-Wno-unused-parameter'] 213 '-Wno-unused-parameter']
211 }, 214 },
212 'arch:arm': {
213 'CPPDEFINES': ['ARM']
214 },
215 'os:win32': { 215 'os:win32': {
216 'WARNINGFLAGS': ['-pedantic', '-Wno-long-long'] 216 'WARNINGFLAGS': ['-pedantic', '-Wno-long-long']
217 }, 217 },
218 'os:linux': { 218 'os:linux': {
219 'WARNINGFLAGS': ['-pedantic'] 219 'WARNINGFLAGS': ['-pedantic']
220 }, 220 },
221 'os:macos': { 221 'os:macos': {
222 'WARNINGFLAGS': ['-pedantic'] 222 'WARNINGFLAGS': ['-pedantic']
223 }, 223 },
224 'disassembler:on': { 224 'disassembler:on': {
225 'CPPDEFINES': ['ENABLE_DISASSEMBLER'] 225 'CPPDEFINES': ['ENABLE_DISASSEMBLER']
226 } 226 }
227 }, 227 },
228 'msvc': { 228 'msvc': {
229 'all': { 229 'all': {
230 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800'] 230 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800']
231 }, 231 },
232 'library:shared': { 232 'library:shared': {
233 'CPPDEFINES': ['BUILDING_V8_SHARED'], 233 'CPPDEFINES': ['BUILDING_V8_SHARED'],
234 'LIBS': ['winmm', 'ws2_32'] 234 'LIBS': ['winmm', 'ws2_32']
235 }, 235 },
236 'arch:arm': { 236 'arch:arm': {
237 'CPPDEFINES': ['ARM'], 237 'CPPDEFINES': ['V8_ARCH_ARM'],
238 # /wd4996 is to silence the warning about sscanf 238 # /wd4996 is to silence the warning about sscanf
239 # used by the arm simulator. 239 # used by the arm simulator.
240 'WARNINGFLAGS': ['/wd4996'] 240 'WARNINGFLAGS': ['/wd4996']
241 }, 241 },
242 'disassembler:on': { 242 'disassembler:on': {
243 'CPPDEFINES': ['ENABLE_DISASSEMBLER'] 243 'CPPDEFINES': ['ENABLE_DISASSEMBLER']
244 } 244 }
245 } 245 }
246 } 246 }
247 247
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 } 334 }
335 } 335 }
336 }, 336 },
337 'msvc': { 337 'msvc': {
338 'all': { 338 'all': {
339 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'], 339 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'],
340 'LIBS': ['winmm', 'ws2_32'] 340 'LIBS': ['winmm', 'ws2_32']
341 }, 341 },
342 'library:shared': { 342 'library:shared': {
343 'CPPDEFINES': ['USING_V8_SHARED'] 343 'CPPDEFINES': ['USING_V8_SHARED']
344 },
345 'arch:ia32': {
346 'CPPDEFINES': ['V8_ARCH_IA32']
344 } 347 }
345 } 348 }
346 } 349 }
347 350
348 351
349 SAMPLE_FLAGS = { 352 SAMPLE_FLAGS = {
350 'all': { 353 'all': {
351 'CPPPATH': [join(abspath('.'), 'include')], 354 'CPPPATH': [join(abspath('.'), 'include')],
352 'LIBS': ['$LIBRARY'], 355 'LIBS': ['$LIBRARY'],
353 }, 356 },
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 'CCFLAGS': ['/MT'] 429 'CCFLAGS': ['/MT']
427 }, 430 },
428 'msvcrt:shared': { 431 'msvcrt:shared': {
429 'CCFLAGS': ['/MD'] 432 'CCFLAGS': ['/MD']
430 }, 433 },
431 'msvcltcg:on': { 434 'msvcltcg:on': {
432 'CCFLAGS': ['/GL'], 435 'CCFLAGS': ['/GL'],
433 'LINKFLAGS': ['/LTCG'], 436 'LINKFLAGS': ['/LTCG'],
434 } 437 }
435 }, 438 },
439 'arch:ia32': {
440 'CPPDEFINES': ['V8_ARCH_IA32']
441 },
436 'mode:debug': { 442 'mode:debug': {
437 'CCFLAGS': ['/Od'], 443 'CCFLAGS': ['/Od'],
438 'LINKFLAGS': ['/DEBUG'], 444 'LINKFLAGS': ['/DEBUG'],
439 'msvcrt:static': { 445 'msvcrt:static': {
440 'CCFLAGS': ['/MTd'] 446 'CCFLAGS': ['/MTd']
441 }, 447 },
442 'msvcrt:shared': { 448 'msvcrt:shared': {
443 'CCFLAGS': ['/MDd'] 449 'CCFLAGS': ['/MDd']
444 } 450 }
445 } 451 }
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 # version of scons. Also, there's a bug in some revisions that 845 # version of scons. Also, there's a bug in some revisions that
840 # doesn't allow this flag to be set, so we swallow any exceptions. 846 # doesn't allow this flag to be set, so we swallow any exceptions.
841 # Lovely. 847 # Lovely.
842 try: 848 try:
843 SetOption('warn', 'no-deprecated') 849 SetOption('warn', 'no-deprecated')
844 except: 850 except:
845 pass 851 pass
846 852
847 853
848 Build() 854 Build()
OLDNEW
« no previous file with comments | « no previous file | test/cctest/test-regexp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698