diff options
| -rw-r--r-- | build/common.gypi | 14 | ||||
| -rwxr-xr-x | build/mac/change_mach_o_flags_from_xcode.sh | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index b6b179a..c8c37bd 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1688,10 +1688,24 @@ # relativization during dict merging. 'change_mach_o_flags_path': 'mac/change_mach_o_flags_from_xcode.sh', + 'change_mach_o_flags_options': [ + ], + 'target_conditions': [ + ['release_valgrind_build==1', { + 'change_mach_o_flags_options': [ + # Turn off PIE when building for Valgrind because + # Valgrind doesn't understand slide. TODO: Make + # Valgrind on Mac OS X understand slide, and get rid + # of the Valgrind check. + '--no-pie', + ], + }], + ], }, 'postbuild_name': 'Change Mach-O Flags', 'action': [ '<(change_mach_o_flags_path)', + '>@(change_mach_o_flags_options)', ], }, ], diff --git a/build/mac/change_mach_o_flags_from_xcode.sh b/build/mac/change_mach_o_flags_from_xcode.sh index ab3ee49..1824f8d 100755 --- a/build/mac/change_mach_o_flags_from_xcode.sh +++ b/build/mac/change_mach_o_flags_from_xcode.sh @@ -11,4 +11,5 @@ set -e exec "$(dirname "${0}")/change_mach_o_flags.py" \ + "${@}" \ "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}" |