Revert 188895 "Add library paths and rlink-paths for directories..."
It broke ChromeOS (http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28amd64%29/builds/7235/steps/BuildTarget/logs/stdio) > Add library paths and rlink-paths for directories in the sysroot. > > NOTRY=true > TEST=Cross compiling with ld.bfd works. > > Review URL: https://chromiumcodereview.appspot.com/12674012 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/12700030 git-svn-id: http://src.chromium.org/svn/trunk/src/build@188904 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
d5bfc6c460
Коммит
a82269cce7
|
@ -2834,7 +2834,6 @@
|
|||
],
|
||||
'ldflags': [
|
||||
'--sysroot=<(sysroot)',
|
||||
'<!(<(DEPTH)/build/linux/sysroot_ld_path.sh <(sysroot))',
|
||||
],
|
||||
}]]
|
||||
}],
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Copyright (c) 2013 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.
|
||||
|
||||
# Reads etc/ld.so.conf.d/*.conf and returns the appropriate linker flags.
|
||||
#
|
||||
# sysroot_ld_path.sh /abspath/to/sysroot
|
||||
#
|
||||
|
||||
if [ $# -ne 1 ]; then
|
||||
echo $0 /abspath/to/sysroot
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo $1 | grep -qs ' '
|
||||
if [ $? -eq 0 ]; then
|
||||
echo $1 contains whitespace.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for entry in $(cat $1/etc/ld.so.conf.d/*.conf | grep ^/)
|
||||
do
|
||||
entry=$1$entry
|
||||
echo -L$entry
|
||||
echo -Wl,-rpath-link=$entry
|
||||
done | xargs echo
|
Загрузка…
Ссылка в новой задаче