| Index: build/config/BUILD.gn
 | 
| diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
 | 
| index 5f93dd9dc2fd78d4012c1641951973c5904ed89c..49b5cfeb6a58ca05cd1c7395d1c67343888ba39a 100644
 | 
| --- a/build/config/BUILD.gn
 | 
| +++ b/build/config/BUILD.gn
 | 
| @@ -231,7 +231,7 @@ config("debug") {
 | 
|        # have to tell it to turn it off.
 | 
|        defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
 | 
|      }
 | 
| -  } else if (is_linux && !is_android && cpu_arch == "x64" &&
 | 
| +  } else if (is_linux && !is_android && current_cpu == "x64" &&
 | 
|               !disable_iterator_debugging) {
 | 
|      # Enable libstdc++ debugging facilities to help catch problems early, see
 | 
|      # http://crbug.com/65151 .
 | 
| 
 |