Changes in directory llvm:
Makefile.rules updated: 1.379 -> 1.380 --- Log message: Do not hardcode random paths into the makefile. Make the user specify the SDK to use when building "universal" on Mac OS/X, if they want to use a specific one. --- Diffs of the changes: (+11 -5) Makefile.rules | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.379 llvm/Makefile.rules:1.380 --- llvm/Makefile.rules:1.379 Thu Jun 15 12:31:22 2006 +++ llvm/Makefile.rules Fri Jun 16 16:47:59 2006 @@ -370,13 +370,19 @@ # 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. +# apps. The UNIVERSAL_SDK_PATH variable can optionally be specified as a path +# to the SDK to use. For Mac OS/X 10.4 Intel machines, the traditional one is: +# UNIVERSAL_SDK_PATH=/Developer/SDKs/MacOSX10.4u.sdk/ ifdef UNIVERSAL - CompileCommonOpts += \ - -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk/ + CompileCommonOpts += -arch i386 -arch ppc Relink.Flags := -XCClinker -arch -XCClinker i386 -XCClinker -arch \ - -XCClinker ppc -XCClinker \ - -isysroot -XCClinker /Developer/SDKs/MacOSX10.4u.sdk/ + -XCClinker ppc + ifdef UNIVERSAL_SDK_PATH + CompileCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH) + Relink.Flags += -XCClinker -isysroot -XCClinker $(UNIVERSAL_SDK_PATH) + endif + + # Building universal cannot compute dependencies automatically. DISABLE_AUTO_DEPENDENCIES=1 endif _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
