diff mbox

fix LIBUNWIND_LINK specification in libgcc.mvars

Message ID 4C110BE60200007800005FB4@vpn.id2.novell.com
State New
Headers show

Commit Message

Jan Beulich June 10, 2010, 1:59 p.m. UTC 
Just like for SHLIB_LINK, $(GCC_FOR_TARGET) should be protected from
being expanded to early - my cross builds for ia64 failed without this
change.

As this used to work with 4.4.x and earlier, I'm at once asking to also
apply this to the 4.5 branch.

gcc/
2010-06-10  Jan Beulich  <jbeulich@novell.com>

	* Makefile.in (libgcc.mvars): Retain GCC_FOR_TARGET for
	SHLIBUNWIND_LINK.
diff mbox

Patch

--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1866,7 +1866,7 @@  libgcc.mvars: config.status Makefile $(L
 	echo LIB2ADDEHSHARED = '$(call srcdirify,$(LIB2ADDEHSHARED) $(srcdir)/emutls.c)' >> tmp-libgcc.mvars
 	echo LIB2_SIDITI_CONV_FUNCS = '$(LIB2_SIDITI_CONV_FUNCS)' >> tmp-libgcc.mvars
 	echo LIBUNWIND = '$(call srcdirify,$(LIBUNWIND))' >> tmp-libgcc.mvars
-	echo SHLIBUNWIND_LINK = '$(SHLIBUNWIND_LINK)' >> tmp-libgcc.mvars
+	echo SHLIBUNWIND_LINK = '$(subst $(GCC_FOR_TARGET),$$(GCC_FOR_TARGET),$(SHLIBUNWIND_LINK))' >> tmp-libgcc.mvars
 	echo SHLIBUNWIND_INSTALL = '$(SHLIBUNWIND_INSTALL)' >> tmp-libgcc.mvars
 	echo FPBIT = '$(FPBIT)' >> tmp-libgcc.mvars
 	echo FPBIT_FUNCS = '$(FPBIT_FUNCS)' >> tmp-libgcc.mvars