diff options
| author | Chris Lattner <sabre@nondot.org> | 2006-06-16 21:47:59 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2006-06-16 21:47:59 +0000 |
| commit | f988e536132419551794443885bd65678a3ee93c (patch) | |
| tree | d0d858ca69c0c3a27adf9019539b41547c2a534c /Makefile.rules | |
| parent | a24b7618f8a64976a5846c97261b2b5fb92da23e (diff) | |
| download | llvm-f988e536132419551794443885bd65678a3ee93c.tar.gz llvm-f988e536132419551794443885bd65678a3ee93c.tar.bz2 llvm-f988e536132419551794443885bd65678a3ee93c.tar.xz | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28842 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.rules b/Makefile.rules index 18814fa5aa..df8f63f6f1 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -370,13 +370,19 @@ endif # 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 |