From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ey0-f172.google.com ([209.85.215.172]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1S7ZKY-0006WA-Io for ptxdist@pengutronix.de; Tue, 13 Mar 2012 22:32:34 +0100 Received: by eaaq11 with SMTP id q11so706006eaa.31 for ; Tue, 13 Mar 2012 14:32:25 -0700 (PDT) From: Remy Bohmer Date: Tue, 13 Mar 2012 22:32:15 +0100 Message-Id: <1331674338-1757-2-git-send-email-linux@bohmer.net> In-Reply-To: <1331674338-1757-1-git-send-email-linux@bohmer.net> References: <1331674338-1757-1-git-send-email-linux@bohmer.net> Subject: [ptxdist] [PATCH 2/5 v2] [x86_64] Add some support for multilib detection in the toolchain Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de For Sourcery Codebench toolchains the 'gcc -print-file-name' only returns the proper sysroot directory when the proper architecture flags are provided via '-m64 -march=' flags. These flags are provided via the ptxdist platformconfig PTXCONF_TARGET_EXTRA_CFLAGS setting. These flags therefore also need to be passed to GCC here. Signed-off-by: Remy Bohmer --- v2: Reworked review comments from Michael Olbrich scripts/install_copy_toolchain.sh | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh index 8a67698..726cc61 100755 --- a/scripts/install_copy_toolchain.sh +++ b/scripts/install_copy_toolchain.sh @@ -50,12 +50,14 @@ ptxd_abs2rel() { # out: $lib_path # ptxd_get_lib_path() { - local lib lib_dir lib_path + local lib lib_dir lib_path extra_cflags lib="${1}" + extra_cppflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CPPFLAGS)" + extra_cflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CFLAGS)" # ask the compiler for the lib - lib_path="$(${CC} -print-file-name=${lib})" + lib_path="$(${CC} ${extra_cppflags} ${extra_cflags} -print-file-name=${lib})" if test "${lib_path}" = "${lib}"; then echo "install_copy_toolchain_lib: ${lib} not found" >&2 return 1 @@ -77,9 +79,11 @@ ptxd_get_lib_path() { # ptxd_get_dl() { local dl + extra_cppflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CPPFLAGS)" + extra_cflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CFLAGS)" dl="$(echo 'int main(void){return 0;}' | \ - ${CC} -x c -o /dev/null -v - 2>&1 | \ + ${CC} ${extra_cppflags} ${extra_cflags} -x c -o /dev/null -v - 2>&1 | \ sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p')" echo "${dl##*/}" -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de