Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: aldot at uclibc.org <aldot@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
Date: Fri, 22 Jun 2007 12:01:51 -0700 (PDT)	[thread overview]
Message-ID: <20070622190151.09C9D48673@busybox.net> (raw)

Author: aldot
Date: 2007-06-22 12:01:48 -0700 (Fri, 22 Jun 2007)
New Revision: 18897

Log:
- fixup ccache to know about usr/bin


Modified:
   trunk/buildroot/toolchain/ccache/ccache.mk


Changeset:
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk	2007-06-22 17:49:14 UTC (rev 18896)
+++ trunk/buildroot/toolchain/ccache/ccache.mk	2007-06-22 19:01:48 UTC (rev 18897)
@@ -46,7 +46,7 @@
 	$(MAKE) CC="$(HOSTCC)" -C $(CCACHE_DIR1)
 
 $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY)
-	mkdir -p $(STAGING_DIR)/usr/bin;
+	mkdir -p $(STAGING_DIR)/usr/bin
 	cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin
 	# Keep the actual toolchain binaries in a directory at the same level.
 	# Otherwise, relative paths for include dirs break.
@@ -55,23 +55,23 @@
 		ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \
 		ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
 		ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc);
-	[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
-		mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
-	(cd $(STAGING_DIR)/bin; \
-		ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-cc; \
-		ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
-		ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
-		ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
+	[ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
+		mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
+	(cd $(STAGING_DIR)/usr/bin; \
+		ln -fs ccache $(GNU_TARGET_NAME)-cc; \
+		ln -fs ccache $(GNU_TARGET_NAME)-gcc; \
+		ln -fs ccache $(REAL_GNU_TARGET_NAME)-cc; \
+		ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc);
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-	[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
-		mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
-	[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
-		mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++  $(STAGING_DIR)/bin-ccache/
-	(cd $(STAGING_DIR)/bin; \
-		ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-c++; \
-		ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-g++;\
-		ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-c++; \
-		ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-g++);
+	[ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
+		mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
+	[ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
+		mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++  $(STAGING_DIR)/bin-ccache/
+	(cd $(STAGING_DIR)/usr/bin; \
+		ln -fs ccache $(GNU_TARGET_NAME)-c++; \
+		ln -fs ccache $(GNU_TARGET_NAME)-g++;\
+		ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \
+		ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++);
 	(cd $(STAGING_DIR)/bin-ccache; \
 		ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \
 		ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++);
@@ -80,27 +80,27 @@
 ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY)
 
 ccache-clean:
-	rm -rf  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cc
-	rm -rf  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
-	rm -rf  $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc
-	rm -rf  $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc
+	rm -rf  $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc
+	rm -rf  $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
+	rm -rf  $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc
+	rm -rf  $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
 	if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
-		mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/; \
-		(cd $(STAGING_DIR)/bin; \
+		mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \
+		(cd $(STAGING_DIR)/usr/bin; \
 		    ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
 		    ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
 		    ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \
 	fi;
 	if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
-		rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++; \
-		mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/; \
+		rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \
+		mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \
 	fi;
 	if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
-		rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++; \
-		mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++  $(STAGING_DIR)/bin/; \
+		rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \
+		mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++  $(STAGING_DIR)/usr/bin/; \
 	fi;
 	rm -rf  $(STAGING_DIR)/bin-ccache/*
-	(cd $(STAGING_DIR)/bin; \
+	(cd $(STAGING_DIR)/usr/bin; \
 		ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \
 		ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\
 		ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++);

             reply	other threads:[~2007-06-22 19:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-22 19:01 aldot at uclibc.org [this message]
2007-06-22 21:58 ` [Buildroot] svn commit: trunk/buildroot/toolchain/ccache Julien Letessier
2007-06-23  8:39   ` Julien Letessier
2007-06-23  9:14   ` Bernhard Fischer
  -- strict thread matches above, loose matches on Subject: below --
2008-10-06 20:28 wberrier at uclibc.org
2008-10-06 19:14 wberrier at uclibc.org
2008-10-06 19:52 ` Peter Korsgaard
2008-10-06 20:29   ` Wade Berrier
2008-08-04 19:08 jacmet at uclibc.org
2008-08-04 19:08 jacmet at uclibc.org
2008-08-04 19:08 jacmet at uclibc.org
2008-08-04 19:07 jacmet at uclibc.org
2007-06-23 13:49 aldot at uclibc.org
2007-02-03 21:07 andersen at uclibc.org
2007-02-03  0:52 andersen at uclibc.org

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=20070622190151.09C9D48673@busybox.net \
    --to=aldot@uclibc.org \
    --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