| OLD | NEW |
| 1 #! -*- python -*- | 1 #! -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client 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 import atexit | 6 import atexit |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import platform | 9 import platform |
| 10 import re | 10 import re |
| (...skipping 2788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2799 BUILD_TYPE_DESCRIPTION = 'Linux ${OPTIMIZATION_LEVEL} build', | 2799 BUILD_TYPE_DESCRIPTION = 'Linux ${OPTIMIZATION_LEVEL} build', |
| 2800 tools = ['target_platform_linux'], | 2800 tools = ['target_platform_linux'], |
| 2801 # TODO(bradnelson): this should really be able to live in unix_like_env | 2801 # TODO(bradnelson): this should really be able to live in unix_like_env |
| 2802 # but can't due to what the target_platform_x module is | 2802 # but can't due to what the target_platform_x module is |
| 2803 # doing. | 2803 # doing. |
| 2804 LINK = '$CXX', | 2804 LINK = '$CXX', |
| 2805 ) | 2805 ) |
| 2806 | 2806 |
| 2807 # Prepend so we can disable warnings via Append | 2807 # Prepend so we can disable warnings via Append |
| 2808 linux_env.Prepend( | 2808 linux_env.Prepend( |
| 2809 CPPDEFINES = [['_DEFAULT_SOURCE', '1'], | 2809 CPPDEFINES = [['_POSIX_C_SOURCE', '199506'], |
| 2810 ['_BSD_SOURCE', '1'], | |
| 2811 ['_POSIX_C_SOURCE', '199506'], | |
| 2812 ['_XOPEN_SOURCE', '600'], | 2810 ['_XOPEN_SOURCE', '600'], |
| 2813 ['_GNU_SOURCE', '1'], | 2811 ['_GNU_SOURCE', '1'], |
| 2814 ['_LARGEFILE64_SOURCE', '1'], | 2812 ['_LARGEFILE64_SOURCE', '1'], |
| 2815 ], | 2813 ], |
| 2816 LIBS = ['rt'], | 2814 LIBS = ['rt'], |
| 2817 ) | 2815 ) |
| 2818 | 2816 |
| 2819 if linux_env.Bit('build_x86_32'): | 2817 if linux_env.Bit('build_x86_32'): |
| 2820 linux_env.Prepend( | 2818 linux_env.Prepend( |
| 2821 CCFLAGS = ['-m32'], | 2819 CCFLAGS = ['-m32'], |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3113 | 3111 |
| 3114 # These add on to those set in pre_base_env, above. | 3112 # These add on to those set in pre_base_env, above. |
| 3115 nacl_env.Append( | 3113 nacl_env.Append( |
| 3116 CPPDEFINES = [ | 3114 CPPDEFINES = [ |
| 3117 # This ensures that UINT32_MAX gets defined. | 3115 # This ensures that UINT32_MAX gets defined. |
| 3118 ['__STDC_LIMIT_MACROS', '1'], | 3116 ['__STDC_LIMIT_MACROS', '1'], |
| 3119 # This ensures that PRId64 etc. get defined. | 3117 # This ensures that PRId64 etc. get defined. |
| 3120 ['__STDC_FORMAT_MACROS', '1'], | 3118 ['__STDC_FORMAT_MACROS', '1'], |
| 3121 # _GNU_SOURCE ensures that strtof() gets declared. | 3119 # _GNU_SOURCE ensures that strtof() gets declared. |
| 3122 ['_GNU_SOURCE', 1], | 3120 ['_GNU_SOURCE', 1], |
| 3123 # strdup, and other common stuff | |
| 3124 ['_DEFAULT_SOURCE', '1'], | |
| 3125 ['_BSD_SOURCE', '1'], | |
| 3126 ['_POSIX_C_SOURCE', '199506'], | 3121 ['_POSIX_C_SOURCE', '199506'], |
| 3127 ['_XOPEN_SOURCE', '600'], | 3122 ['_XOPEN_SOURCE', '600'], |
| 3128 | 3123 |
| 3129 ['DYNAMIC_ANNOTATIONS_ENABLED', '1' ], | 3124 ['DYNAMIC_ANNOTATIONS_ENABLED', '1' ], |
| 3130 ['DYNAMIC_ANNOTATIONS_PREFIX', 'NACL_' ], | 3125 ['DYNAMIC_ANNOTATIONS_PREFIX', 'NACL_' ], |
| 3131 | 3126 |
| 3132 ['NACL_BUILD_ARCH', '${BUILD_ARCHITECTURE}'], | 3127 ['NACL_BUILD_ARCH', '${BUILD_ARCHITECTURE}'], |
| 3133 ['NACL_BUILD_SUBARCH', '${BUILD_SUBARCH}'], | 3128 ['NACL_BUILD_SUBARCH', '${BUILD_SUBARCH}'], |
| 3134 ], | 3129 ], |
| 3135 ) | 3130 ) |
| (...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4046 nacl_env.ValidateSdk() | 4041 nacl_env.ValidateSdk() |
| 4047 | 4042 |
| 4048 if BROKEN_TEST_COUNT > 0: | 4043 if BROKEN_TEST_COUNT > 0: |
| 4049 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 4044 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
| 4050 if GetOption('brief_comstr'): | 4045 if GetOption('brief_comstr'): |
| 4051 msg += " Add --verbose to the command line for more information." | 4046 msg += " Add --verbose to the command line for more information." |
| 4052 print msg | 4047 print msg |
| 4053 | 4048 |
| 4054 # separate warnings from actual build output | 4049 # separate warnings from actual build output |
| 4055 Banner('B U I L D - O U T P U T:') | 4050 Banner('B U I L D - O U T P U T:') |
| OLD | NEW |