Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2447)

Unified Diff: build_tools/common.sh

Issue 1417373005: Fix shared library support in glibc python build (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ports/python/build.sh » ('j') | ports/python/build.sh » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_tools/common.sh
diff --git a/build_tools/common.sh b/build_tools/common.sh
index f9872b6c8dcb5d01c36f3eba7e1b1d520281cc22..1b342eca51a16cc20bf5d8d21241ec273ed55b59 100644
--- a/build_tools/common.sh
+++ b/build_tools/common.sh
@@ -339,6 +339,13 @@ PatchSpecsFile() {
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
@@ -406,12 +413,6 @@ PatchSpecsFile() {
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}"
}
« no previous file with comments | « no previous file | ports/python/build.sh » ('j') | ports/python/build.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698