Show
Ignore:
Timestamp:
11/28/07 21:35:49 (10 months ago)
Author:
patrick
Message:

MFT r20954: Removed the -m option used with ld(1) on Mac OS X. The Juggler

libraries do not have multiply defined symbols to ignore, and that
option is obsolete in Mac OS X 10.5.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/modules/gadgeteer/Makefile.inc.in

    r20363 r20957  
    180180ifeq ($(ISA), universal) 
    181181        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
    182             ld -arch $$a -dynamic -m -r -d -bind_at_load -o           \ 
     182            ld -arch $$a -dynamic -r -d -bind_at_load -o              \ 
    183183              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
    184184         done 
    185185        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
    186186else 
    187         ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     187        ld -dynamic -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
    188188endif 
    189189        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \ 
    …… 
    214214ifeq ($(ISA), universal) 
    215215        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
    216             ld -arch $$a -dynamic -m -r -d -bind_at_load -o           \ 
     216            ld -arch $$a -dynamic -r -d -bind_at_load -o              \ 
    217217              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
    218218         done 
    219219        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
    220220else 
    221         ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     221        ld -dynamic -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
    222222endif 
    223223        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \