[LLVMdev] Merge Patch File

Mike Stump mrs at apple.com
Wed Mar 19 16:33:10 PDT 2008


On Mar 19, 2008, at 2:55 PM, Bill Wendling wrote:
> Thanks, Mike! I applied this to the tree.

No, you applied something else to the tree!  :-)  I had a space before  
the \ and after the ".  The below should fix it.

Doing diffs in .:
--- ./Makefile.in.~1~	2008-03-19 15:45:54.000000000 -0700
+++ ./Makefile.in	2008-03-19 16:30:07.000000000 -0700
@@ -1689,7 +1689,7 @@ libgcc.mk: config.status Makefile mklibg
  	D128PBIT='$(D128PBIT)' \
  	D128PBIT_FUNCS='$(D128PBIT_FUNCS)' \
  	APPLE_LOCAL='APPLE LOCAL libcc_kext' \
-	MULTILIBS="`$(GCC_FOR_TARGET) --print-multi-lib` $ 
(APPLE_EXTRA_MULTI)"\
+	MULTILIBS="`$(GCC_FOR_TARGET) --print-multi-lib` $ 
(APPLE_EXTRA_MULTI)" \
  	EXTRA_MULTILIB_PARTS='$(EXTRA_MULTILIB_PARTS)' \
  	SHLIB_LINK='$(SHLIB_LINK)' \
  	SHLIB_INSTALL='$(SHLIB_INSTALL)' \
--------------




More information about the llvm-dev mailing list