third_party/binutils: Add --enable-deterministic-archives

third_party/binutils/build-one.sh

 #!/bin/sh
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to build binutils found in /build/binutils-XXXX when inside a chroot.
 # Don't call this script yourself, instead use the build-all.sh script.
 
 set -e
+set -x
 
 if [ -z "$1" ]; then
  echo "Directory of binutils not given."
  exit 1
 fi
 
 cd "$1"
 
 # First, we need to build libtcmalloc_minimal
 
 cd ../gperftools/
 ./autogen.sh
-./configure --disable-static --enable-minimal --disable-heap-checker \
-  --disable-heap-profiler --disable-cpu-profiler
+./configure \
+  --disable-cpu-profiler \
+  --disable-heap-checker \
+  --disable-heap-profiler \
+  --disable-static \
+  --enable-minimal
+
+echo
+echo "= gperftools src/config.h =========================================="
+cat src/config.h
+echo "===================================================================="
+echo
+
 make -j8
 
 cd "$1"
 
 # Ask the dynamic loader to load libstdc++ from the LLVM build directory if
 # available. That copy of libstdc++ is required by the gold plugin in the same
 # directory. Do the same for libtcmalloc_minimal, that is stored in ../lib.
 # The dynamic loader expects the relative path to start with $ORIGIN,
 # but because of escaping issues
 # (https://sourceware.org/ml/binutils/2009-05/msg00252.html)
 # we embed a dummy path with $ replaced with z and fix it up later.
 
 readonly LIBSTDCPP_RPATH="zORIGIN/../../../../llvm-build/Release+Asserts/lib"
 readonly LIBTCMALLOC_RPATH="zORIGIN/../lib"
 export LDFLAGS="-Wl,-rpath,$LIBSTDCPP_RPATH:$LIBTCMALLOC_RPATH \
                 -L$(pwd)/../gperftools/.libs/"
 export LIBS='-ltcmalloc_minimal'
 
-./configure --enable-gold=default --enable-threads --enable-plugins \
+./configure \
+  --enable-deterministic-archives \
+  --enable-gold=default \
+  --enable-plugins \
+  --enable-threads \
   --prefix=/build/output
 
+
 make -j8 all
+echo
+echo "= binutils/config.h ================================================"
+cat binutils/config.h
+echo "===================================================================="
+echo
 make install
 
 # Copy libtcmalloc_minimal library and symlinks to the install lib dir.
 cp -a ../gperftools/.libs/libtcmalloc_minimal.so* /build/output/*/lib/
 
 # Save the list of binaries. The sed -i command will leave .orig files behind.
 # We don't want them to appear in the for loop below.
 bins="$(echo /build/output/*/bin/*)"
 
 # Fix up zORIGIN -> $ORIGIN.
 sed -i.orig 's,zORIGIN,$ORIGIN,g' $bins
 
 # Verify that we changed only two bytes per executable.
 for bin in $bins; do
   test "`cmp -l $bin.orig $bin | wc -l`" = 2 || \
     (echo "$bin: verification failed" && exit 1)
 done
 
 rm /build/output/*/bin/*.orig