[llvm-commits] CVS: llvm/Makefile.rules

[Chris Lattner]

Changes in directory llvm:

Makefile.rules updated: 1.362 -> 1.363
---
Log message:

Final piece to get relinked .o files buildable universal on Darwin.


---
Diffs of the changes:  (+6 -2)

 Makefile.rules |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.362 llvm/Makefile.rules:1.363
--- llvm/Makefile.rules:1.362	Wed Apr 12 13:21:35 2006
+++ llvm/Makefile.rules	Wed Apr 19 13:45:29 2006
@@ -362,7 +362,11 @@
 # If we are building a universal binary on Mac OS/X, pass extra options.  This is
 # useful to people that want to link the LLVM libraries into their universal apps.
 ifdef UNIVERSAL
-  CompileCommonOpts += -arch i386 -arch ppc -isysroot /Developer/SDKs/MACOSX10.4u.sdk/
+  CompileCommonOpts += \
+      -arch i386 -arch ppc -isysroot /Developer/SDKs/MACOSX10.4u.sdk/
+  Relink.Flags := -XCClinker -arch -XCClinker i386 -XCClinker -arch \
+      -XCClinker ppc -XCClinker \
+      -isysroot -XCClinker /Developer/SDKs/MACOSX10.4u.sdk/
   DISABLE_AUTO_DEPENDENCIES=1
 endif
 
@@ -397,7 +401,7 @@
 Link          = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
 	        $(CompileCommonOpts) $(LD.Flags) $(Strip)
 Relink        = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
-                $(CompileCommonOpts)
+                $(CompileCommonOpts) $(Relink.Flags)
 LTInstall     = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) \
 		$(Install.Flags)
 ProgInstall   = $(INSTALL) $(Install.StripFlag) -m 0755