Bug 1369866 - Use TOOLCHAIN_PREFIX when running dyldinfo; r=ted
authorMike Shal <mshal@mozilla.com>
Fri, 02 Jun 2017 16:09:11 -0400
changeset 412827 bfb69fd3ed936ded13e9b4210ab158b823f99c49
parent 412826 60d3fb7b6810db236778a36f77e277e2c497eb43
child 412828 4de35d116e5b046104bf7b6f8286eaadf95a4ec2
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1369866
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1369866 - Use TOOLCHAIN_PREFIX when running dyldinfo; r=ted The test in old-configure.in for MOZ_REPLACE_MALLOC_LINKAGE runs dyldinfo, which is a native tool on OSX. We have it in the cross toolchain as well, but as x86_64-apple-darwin11-dyldinfo. We should use the TOOLCHAIN_PREFIX here to make sure we get the same result as native builds. MozReview-Commit-ID: 3jyzpaM8ZGy
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -4100,17 +4100,17 @@ if test -n "$MOZ_REPLACE_MALLOC"; then
                  dnl forgets to set the weak flag in the dyld info.
                  dnl See http://glandium.org/blog/?p=2764 for more details.
                  dnl
                  dnl Values for ac_cv_weak_dynamic_linking, and subsequently
                  dnl MOZ_REPLACE_MALLOC_LINKAGE are thus:
                  dnl - "flat namespace" when -flat_namespace alone is needed
                  dnl - "dummy library" when a dummy library and -flat_namespace are needed
                  dnl - "compiler support" when nothing is needed
-                 if test -n "$_DYLD_INFO" && dyldinfo -bind conftest${DLL_SUFFIX} 2> /dev/null | grep "_foo (weak import)" > /dev/null; then
+                 if test -n "$_DYLD_INFO" && ${TOOLCHAIN_PREFIX}dyldinfo -bind conftest${DLL_SUFFIX} 2> /dev/null | grep "_foo (weak import)" > /dev/null; then
                      if test -n "$_CLASSIC_INFO"; then
                          ac_cv_weak_dynamic_linking="flat namespace"
                      else
                          ac_cv_weak_dynamic_linking="compiler support"
                      fi
                  else
                      if test -n "$_DYLD_INFO"; then
                          ac_cv_weak_dynamic_linking="dummy library"