Fix shared library support in glibc python build

build_tools/common.sh

 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Environment variable NACL_ARCH should be set to one of the following
 # values: i686 x86_64 pnacl arm
 
 
 # NAMING CONVENTION
 # =================
@@ skipping 321 matching lines @@
 
 PatchSpecsFile() {
   if [ "${TOOLCHAIN}" = "pnacl" -o \
        "${TOOLCHAIN}" = "clang-newlib" -o \
        "${TOOLCHAIN}" = "emscripten" ]; then
     # The emscripten and PNaCl toolchains already include the required
     # include and library paths by default. No need to patch them.
     return
   fi
 
+  # For the library path we always explicitly add to the link flags
+  # otherwise 'libtool' won't find the libraries correctly.  This
+  # is because libtool uses 'gcc -print-search-dirs' which does
+  # not honor the external specs file.
+  NACLPORTS_LDFLAGS+=" -L${NACLPORTS_LIBDIR}"
+  NACLPORTS_LDFLAGS+=" -Wl,-rpath-link=${NACLPORTS_LIBDIR}"
+
   # SPECS_FILE is where nacl-gcc 'specs' file will be installed
   local SPECS_DIR=
   if [ "${NACL_ARCH}" = "arm" ]; then
     SPECS_DIR=${NACL_TOOLCHAIN_ROOT}/lib/gcc/arm-nacl/4.8.3
     if [ ! -d "${SPECS_DIR}" ]; then
       SPECS_DIR=${NACL_TOOLCHAIN_ROOT}/lib/gcc/arm-nacl/4.9.2
     fi
   else
     SPECS_DIR=${NACL_TOOLCHAIN_ROOT}/lib/gcc/x86_64-nacl/4.4.3
   fi
@@ skipping 47 matching lines @@
       N
       s|$| -rpath-link=${SED_SAFE_SPACES_USR_LIB} -L${SED_SAFE_SPACES_USR_LIB}|
     }" > "${SPECS_FILE}"
 
   # For static-only toolchains (i.e. pnacl), modify the specs file to give an
   # error when attempting to create a shared object.
   if [ "${NACL_SHARED}" != "1" ]; then
     sed -i.bak "s/%{shared:-shared/%{shared:%e${ERROR_MSG}/" "${SPECS_FILE}"
   fi
 
-  # For the library path we always explicitly add to the link flags
-  # otherwise 'libtool' won't find the libraries correctly.  This
-  # is because libtool uses 'gcc -print-search-dirs' which does
-  # not honor the external specs file.
-  NACLPORTS_LDFLAGS+=" -L${NACLPORTS_LIBDIR}"
-  NACLPORTS_LDFLAGS+=" -Wl,-rpath-link=${NACLPORTS_LIBDIR}"
 }
 
 
 ######################################################################
 # Helper functions
 ######################################################################
 
 Banner() {
   echo "######################################################################"
   echo "$@"
@@ skipping 1158 matching lines @@
 ######################################################################
 # Always run
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 PatchSpecsFile
 InjectSystemHeaders
 InstallConfigSite
 GetRevision
 MakeDirs