Show
Ignore:
Timestamp:
11/28/07 21:35:49 (1 year 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/sonix/Makefile.inc.in

    r20363 r20957  
    174174ifeq ($(ISA), universal) 
    175175        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
    176             ld -arch $$a -dynamic -m -r -d -bind_at_load -o           \ 
     176            ld -arch $$a -dynamic -r -d -bind_at_load -o              \ 
    177177              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
    178178         done 
    179179        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
    180180else 
    181         ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     181        ld -dynamic -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
    182182endif 
    183183        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \ 
    …… 
    208208ifeq ($(ISA), universal) 
    209209        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
    210             ld -arch $$a -dynamic -m -r -d -bind_at_load -o           \ 
     210            ld -arch $$a -dynamic -r -d -bind_at_load -o              \ 
    211211              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
    212212         done 
    213213        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
    214214else 
    215         ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     215        ld -dynamic -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
    216216endif 
    217217        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \