diff options
| author | Chris Lattner <sabre@nondot.org> | 2006-06-29 19:38:04 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2006-06-29 19:38:04 +0000 |
| commit | 7dabf399b95aad4056985eac346451e134de9ebe (patch) | |
| tree | ad58af0a8b6d5d6277b180051b76169269f6eac8 | |
| parent | 775ff18257617da283237b3fe2480f0d8a249ac7 (diff) | |
Allow specifying an explicit list of architectures to build for, e.g.:
make ENABLE_OPTIMIZED=1 UNIVERSAL=1 UNIVERSAL_ARCH="i386 ppc ppc64"
retain the default of building for just i386/ppc.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28985 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Makefile.rules b/Makefile.rules index 16c5b43eef..199602f38a 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -370,13 +370,22 @@ 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. 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/ +# apps. +# +# The following can be optionally specified: +# UNIVERSAL_SDK_PATH variable can 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/ +# UNIVERSAL_ARCH can be optionally specified to be a list of architectures +# to build for, e.g. UNIVERSAL_ARCH="i386 ppc ppc64". This defaults to +# i386/ppc only. ifdef UNIVERSAL - CompileCommonOpts += -arch i386 -arch ppc - Relink.Flags := -XCClinker -arch -XCClinker i386 -XCClinker -arch \ - -XCClinker ppc + ifndef UNIVERSAL_ARCH + UNIVERSAL_ARCH := i386 ppc + endif + UNIVERSAL_ARCH_OPTIONS := $(UNIVERSAL_ARCH:%=-arch %) + CompileCommonOpts += $(UNIVERSAL_ARCH_OPTIONS) + Relink.Flags := $(UNIVERSAL_ARCH_OPTIONS:%=-XCClinker %) ifdef UNIVERSAL_SDK_PATH CompileCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH) Relink.Flags += -XCClinker -isysroot -XCClinker $(UNIVERSAL_SDK_PATH) |