Changeset 16545 for release


Ignore:
Timestamp:
Sep 11, 2015, 7:42:30 PM (3 years ago)
Author:
rme
Message:

Merge OS X Makefile tweaks from trunk.

Location:
release/1.11/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.11/source

  • release/1.11/source/lisp-kernel/darwinx8632/Makefile

    r16133 r16545  
    3030M4FLAGS = -DDARWIN -DX86 -DX8632
    3131ASFLAGS = -arch i386 -g
     32
     33# In Xcode 7, the clang integrated assember complains that .stabs
     34# directives are unsupported.  Work around this by using the system
     35# assembler.  (Apparently, we'll have to quit using .stabs directives
     36# at some point soon.)
     37
     38# Since Xcode 7 only runs on Yosemite and later, use OS version as a
     39# heuristic to detect whether the -Q flag is available.  It seems to
     40# be available as far back as Lion, but on Snow Leopard, "as" doesn't
     41# know about -Q.
     42
     43yosemite_plus := $(shell uname -r | awk -F. '{ if ($$1 >= 14) print "t" }')
     44ifeq ($(yosemite_plus),t)
     45ASFLAGS += -Q
     46endif
     47
    3248CDEFINES = -DDARWIN -DX86 -DX8632 -DSVN_REVISION=$(SVN_REVISION) -D_DARWIN_NO_64_BIT_INODE -DUSE_DTRACE
    3349CDEBUG = -g
  • release/1.11/source/lisp-kernel/darwinx8664/Makefile

    r16167 r16545  
    5151M4FLAGS = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR
    5252ASFLAGS = -arch x86_64 -g
     53
     54# In Xcode 7, the clang integrated assember complains that .stabs
     55# directives are unsupported.  Work around this by using the system
     56# assembler.  (Apparently, we'll have to quit using .stabs directives
     57# at some point soon.)
     58
     59# Since Xcode 7 only runs on Yosemite and later, use OS version as a
     60# heuristic to detect whether the -Q flag is available.  It seems to
     61# be available as far back as Lion, but on Snow Leopard, "as" doesn't
     62# know about -Q.
     63
     64yosemite_plus := $(shell uname -r | awk -F. '{ if ($$1 >= 14) print "t" }')
     65ifeq ($(yosemite_plus),t)
     66ASFLAGS += -Q
     67endif
     68
    5369CDEFINES = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR -DSVN_REVISION=$(SVN_REVISION) \
    5470           -D_DARWIN_NO_64_BIT_INODE -DUSE_DTRACE
Note: See TracChangeset for help on using the changeset viewer.