diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-15 14:03:16 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-15 14:03:16 -0700 |
| commit | 9a2ec7c6ed3eb1b133257f5f40503034fcde40de (patch) | |
| tree | 06f6f2e29330c940059a4df7193b905a01c3b7bf /Makefile.rules | |
| parent | 0ecc9098929275a2b6672d625106225231bed813 (diff) | |
| parent | bb20b24224734f5369d124181d086703ca439dd7 (diff) | |
Merge commit 'bb20b24224734f5369d124181d086703ca439dd7'
Conflicts:
lib/Target/X86/X86FrameLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules index 4edf401f8d..51accc512b 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -571,7 +571,11 @@ endif #-------------------------------------------------------------------- ifeq ($(HOST_OS),Darwin) + ifdef MACOSX_DEPLOYMENT_TARGET + DARWIN_VERSION := $(MACOSX_DEPLOYMENT_TARGET) + else DARWIN_VERSION := `sw_vers -productVersion` + endif # Strip a number like 10.4.7 to 10.4 DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/') # Get "4" out of 10.4 for later pieces in the makefile. |