OLD | NEW |
---|---|
1 # Copyright 2016 the V8 project authors. All rights reserved. | 1 # Copyright 2016 the V8 project authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/sanitizers/sanitizers.gni") | 5 import("//build/config/sanitizers/sanitizers.gni") |
6 import("//build/config/v8_target_cpu.gni") | 6 import("//build/config/v8_target_cpu.gni") |
7 | 7 |
8 declare_args() { | 8 declare_args() { |
9 # Indicate if valgrind was fetched as a custom deps to make it available on | 9 # Indicate if valgrind was fetched as a custom deps to make it available on |
10 # swarming. | 10 # swarming. |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
80 source_set(target_name) { | 80 source_set(target_name) { |
81 forward_variables_from(invoker, "*", [ "configs" ]) | 81 forward_variables_from(invoker, "*", [ "configs" ]) |
82 configs += invoker.configs | 82 configs += invoker.configs |
83 configs -= v8_remove_configs | 83 configs -= v8_remove_configs |
84 configs += v8_add_configs | 84 configs += v8_add_configs |
85 } | 85 } |
86 } | 86 } |
87 | 87 |
88 template("v8_executable") { | 88 template("v8_executable") { |
89 executable(target_name) { | 89 executable(target_name) { |
90 forward_variables_from(invoker, "*", [ "configs" ]) | 90 forward_variables_from(invoker, "*", [ "configs", "want_pie"]) |
91 configs += invoker.configs | 91 configs += invoker.configs |
92 configs -= v8_remove_configs | 92 configs -= v8_remove_configs |
93 configs += v8_add_configs | 93 configs += v8_add_configs |
94 if (is_linux) { | 94 if (!defined(invoker.want_pie) || invoker.want_pie) { |
95 # For enabling ASLR. | 95 if (is_linux) { |
96 ldflags = [ "-pie" ] | 96 # For enabling ASLR. |
97 ldflags = [ "-pie" ] | |
98 } | |
99 } else { | |
100 if (is_android) { | |
101 configs -= [ "//build/config/android:executable_config" ] | |
Michael Achenbach
2016/07/27 13:15:59
This is the only change in patch 3
| |
102 } | |
97 } | 103 } |
98 } | 104 } |
99 } | 105 } |
100 | 106 |
101 template("v8_component") { | 107 template("v8_component") { |
102 component(target_name) { | 108 component(target_name) { |
103 forward_variables_from(invoker, "*", [ "configs" ]) | 109 forward_variables_from(invoker, "*", [ "configs" ]) |
104 configs += invoker.configs | 110 configs += invoker.configs |
105 configs -= v8_remove_configs | 111 configs -= v8_remove_configs |
106 configs += v8_add_configs | 112 configs += v8_add_configs |
107 } | 113 } |
108 } | 114 } |
OLD | NEW |