OLD | NEW |
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 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
942 else: | 942 else: |
943 # There seems to be a glitch in the way scons decides where to put | 943 # There seems to be a glitch in the way scons decides where to put |
944 # PDB files when compiling using MSVC so we specify it manually. | 944 # PDB files when compiling using MSVC so we specify it manually. |
945 # This should not affect any other platforms. | 945 # This should not affect any other platforms. |
946 pdb_name = library_name + '.dll.pdb' | 946 pdb_name = library_name + '.dll.pdb' |
947 library = env.SharedLibrary(library_name, object_files, PDB=pdb_name) | 947 library = env.SharedLibrary(library_name, object_files, PDB=pdb_name) |
948 context.library_targets.append(library) | 948 context.library_targets.append(library) |
949 | 949 |
950 d8_env = Environment() | 950 d8_env = Environment() |
951 d8_env.Replace(**context.flags['d8']) | 951 d8_env.Replace(**context.flags['d8']) |
| 952 context.ApplyEnvOverrides(d8_env) |
952 shell = d8_env.Program('d8' + suffix, object_files + shell_files) | 953 shell = d8_env.Program('d8' + suffix, object_files + shell_files) |
953 context.d8_targets.append(shell) | 954 context.d8_targets.append(shell) |
954 | 955 |
955 for sample in context.samples: | 956 for sample in context.samples: |
956 sample_env = Environment(LIBRARY=library_name) | 957 sample_env = Environment(LIBRARY=library_name) |
957 sample_env.Replace(**context.flags['sample']) | 958 sample_env.Replace(**context.flags['sample']) |
958 context.ApplyEnvOverrides(sample_env) | 959 context.ApplyEnvOverrides(sample_env) |
959 sample_object = sample_env.SConscript( | 960 sample_object = sample_env.SConscript( |
960 join('samples', 'SConscript'), | 961 join('samples', 'SConscript'), |
961 build_dir=join('obj', 'sample', sample, target_id), | 962 build_dir=join('obj', 'sample', sample, target_id), |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1018 # version of scons. Also, there's a bug in some revisions that | 1019 # version of scons. Also, there's a bug in some revisions that |
1019 # doesn't allow this flag to be set, so we swallow any exceptions. | 1020 # doesn't allow this flag to be set, so we swallow any exceptions. |
1020 # Lovely. | 1021 # Lovely. |
1021 try: | 1022 try: |
1022 SetOption('warn', 'no-deprecated') | 1023 SetOption('warn', 'no-deprecated') |
1023 except: | 1024 except: |
1024 pass | 1025 pass |
1025 | 1026 |
1026 | 1027 |
1027 Build() | 1028 Build() |
OLD | NEW |