Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/5] toolchain-external: remove unused calculation of ARCH_SUBDIR
Date: Fri, 12 Feb 2016 20:20:23 +0100	[thread overview]
Message-ID: <1455304826-10557-3-git-send-email-patrickdepinguin@gmail.com> (raw)
In-Reply-To: <1455304826-10557-1-git-send-email-patrickdepinguin@gmail.com>

From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

In TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS, ARCH_SUBDIR is calculated but not
used, and can thus be removed. Since SYSROOT_DIR is only used for the
calculation of ARCH_SUBDIR, it can be removed too.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 toolchain/toolchain-external/toolchain-external.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index ffdee49..9d88158 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -587,12 +587,7 @@ endef
 #                       to the target filesystem.
 
 define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
-	$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
-	if test -z "$${SYSROOT_DIR}" ; then \
-		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
-		exit 1 ; \
-	fi ; \
-	ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+	$(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
 	ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
 	SUPPORT_LIB_DIR="" ; \
 	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
@@ -601,7 +596,6 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
 			SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
 		fi ; \
 	fi ; \
-	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	if test -z "$(BR2_STATIC_LIBS)" ; then \
 		$(call MESSAGE,"Copying external toolchain libraries to target...") ; \
 		for libs in $(LIB_EXTERNAL_LIBS); do \
-- 
2.4.10

  parent reply	other threads:[~2016-02-12 19:20 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-12 19:20 [Buildroot] [PATCH 0/5] Align library locations in target and staging Thomas De Schampheleire
2016-02-12 19:20 ` [Buildroot] [PATCH 1/5] toolchain-external: blackfin: install FDPIC libraries also to staging Thomas De Schampheleire
2016-03-22 21:48   ` Romain Naour
2016-03-27 16:20   ` Arnout Vandecappelle
2016-04-25 21:00   ` Thomas Petazzoni
2016-02-12 19:20 ` Thomas De Schampheleire [this message]
2016-03-22 21:53   ` [Buildroot] [PATCH 2/5] toolchain-external: remove unused calculation of ARCH_SUBDIR Romain Naour
2016-03-27 20:34   ` Arnout Vandecappelle
2016-03-27 23:10     ` Arnout Vandecappelle
2016-04-21 21:30   ` Thomas Petazzoni
2016-02-12 19:20 ` [Buildroot] [PATCH 3/5] toolchain-external: extract installation of gdbserver to separate define Thomas De Schampheleire
2016-03-22 22:04   ` Romain Naour
2016-03-27 16:43     ` Arnout Vandecappelle
2016-04-25 21:02   ` Thomas Petazzoni
2016-02-12 19:20 ` [Buildroot] [PATCH 4/5] toolchain-external: align library locations in target and staging dir Thomas De Schampheleire
2016-03-22 22:53   ` Romain Naour
2016-03-27 20:34   ` Arnout Vandecappelle
2016-04-25 21:15     ` Thomas Petazzoni
2016-04-26 11:32       ` Thomas De Schampheleire
2016-04-25 21:08   ` Thomas Petazzoni
2016-02-12 19:20 ` [Buildroot] [PATCH 5/5] toolchain-external: unify LIB_EXTERNAL_LIBS and USR_LIB_EXTERNAL_LIBS Thomas De Schampheleire
2016-03-22 22:58   ` Romain Naour
2016-03-27 20:36   ` Arnout Vandecappelle
2016-04-25 21:16   ` Thomas Petazzoni
2016-03-10  8:02 ` [Buildroot] [PATCH 0/5] Align library locations in target and staging Thomas De Schampheleire
2016-03-27 20:39 ` Arnout Vandecappelle
2016-03-27 20:52   ` Romain Naour
2016-03-27 23:08     ` Arnout Vandecappelle
2016-03-29 14:21   ` Thomas De Schampheleire
2016-03-29 14:33     ` Arnout Vandecappelle
2016-04-25 21:17 ` Thomas Petazzoni
2016-04-26  7:50   ` Thomas De Schampheleire
2016-04-26  8:28     ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455304826-10557-3-git-send-email-patrickdepinguin@gmail.com \
    --to=patrickdepinguin@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox