summaryrefslogtreecommitdiff
path: root/devel/avr-gcc-devel/files/patch-cross-installation
blob: 1cfd7e85579d7b0994b07739c1cf2ed5012827ee (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
This hack avoids tampering with ${LOCALBASE}/avr/bin/{gcc,c++,g++} which
would conflict with a possibly installed version of devel/avr-gcc.
Funny enough, these binaries would only be installed in case ${LOCALBASE}/avr/bin
is already present.
--- gcc/Makefile.in~	2008-05-11 20:54:15.000000000 +0200
+++ gcc/Makefile.in	2008-07-28 17:05:26.000000000 +0200
@@ -3979,10 +3979,7 @@
 	-( cd $(DESTDIR)$(bindir) && \
 	   $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )
 	-if [ -f gcc-cross$(exeext) ] ; then \
-	  if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
-	    rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
-	    $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
-	  else true; fi; \
+	  : \
 	else \
 	  rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \
 	  ( cd $(DESTDIR)$(bindir) && \
--- gcc/cp/Make-lang.in~	2008-02-27 10:26:24.000000000 +0100
+++ gcc/cp/Make-lang.in	2008-07-28 17:07:32.000000000 +0200
@@ -154,13 +154,7 @@
 	      $(LN) $(GXX_INSTALL_NAME)$(exeext) $(CXX_INSTALL_NAME)$(exeext) )
 	-if [ -f cc1plus$(exeext) ] ; then \
 	  if [ -f g++-cross$(exeext) ] ; then \
-	    if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
-	      rm -f $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \
-	      $(INSTALL_PROGRAM) g++-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \
-	      rm -f $(DESTDIR)$(gcc_tooldir)/bin/c++$(exeext); \
-	      ( cd $(DESTDIR)$(gcc_tooldir)/bin && \
-		$(LN) g++$(exeext) c++$(exeext) ); \
-	    else true; fi; \
+	    : \
 	  else \
 	    rm -f $(DESTDIR)$(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \
 	    ( cd $(DESTDIR)$(bindir) && \