| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium 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/sysroot.gni") | 5 import("//build/config/sysroot.gni") | 
| 6 import("//build/config/mac/mac_sdk.gni") | 6 import("//build/config/mac/mac_sdk.gni") | 
| 7 | 7 | 
| 8 config("sdk") { | 8 config("sdk") { | 
| 9   common_flags = [ | 9   common_flags = [ | 
| 10     "-isysroot", | 10     "-isysroot", | 
| 11     sysroot, | 11     sysroot, | 
| 12     "-mmacosx-version-min=$mac_deployment_target", | 12     "-mmacosx-version-min=$mac_deployment_target", | 
| 13   ] | 13   ] | 
| 14 | 14 | 
|  | 15   asmflags = common_flags | 
| 15   cflags = common_flags | 16   cflags = common_flags | 
| 16   ldflags = common_flags | 17   ldflags = common_flags | 
| 17 } | 18 } | 
| 18 | 19 | 
| 19 # On Mac, this is used for everything except static libraries. | 20 # On Mac, this is used for everything except static libraries. | 
| 20 config("mac_dynamic_flags") { | 21 config("mac_dynamic_flags") { | 
| 21   ldflags = [] | 22   ldflags = [] | 
| 22 | 23 | 
| 23   if (is_component_build) { | 24   if (is_component_build) { | 
| 24     ldflags += [ | 25     ldflags += [ | 
| 25       # Path for loading shared libraries for unbundled binaries. | 26       # Path for loading shared libraries for unbundled binaries. | 
| 26       "-Wl,-rpath,@loader_path/.", | 27       "-Wl,-rpath,@loader_path/.", | 
| 27 | 28 | 
| 28       # Path for loading shared libraries for bundled binaries. Get back from | 29       # Path for loading shared libraries for bundled binaries. Get back from | 
| 29       # Binary.app/Contents/MacOS. | 30       # Binary.app/Contents/MacOS. | 
| 30       "-Wl,-rpath,@loader_path/../../..", | 31       "-Wl,-rpath,@loader_path/../../..", | 
| 31     ] | 32     ] | 
| 32   } | 33   } | 
| 33 } | 34 } | 
| 34 | 35 | 
| 35 # On Mac, this is used only for executables. | 36 # On Mac, this is used only for executables. | 
| 36 config("mac_executable_flags") { | 37 config("mac_executable_flags") { | 
| 37   # Remove this when targeting >=10.7 since it is the default in that config. | 38   # Remove this when targeting >=10.7 since it is the default in that config. | 
| 38   ldflags = [ "-Wl,-pie" ]  # Position independent. | 39   ldflags = [ "-Wl,-pie" ]  # Position independent. | 
| 39 } | 40 } | 
| OLD | NEW | 
|---|