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/tweek/Makefile.inc.in

    r20444 r20957  
    205205ifeq ($(ISA), universal) 
    206206        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
    207             ld -arch $$a -dynamic -m -r -d -bind_at_load -o           \ 
     207            ld -arch $$a -dynamic -r -d -bind_at_load -o              \ 
    208208              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
    209209         done 
    210210        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
    211211else 
    212         ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     212        ld -dynamic -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
    213213endif 
    214214        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \ 
    …… 
    239239ifeq ($(ISA), universal) 
    240240        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
    241             ld -arch $$a -dynamic -m -r -d -bind_at_load -o           \ 
     241            ld -arch $$a -dynamic -r -d -bind_at_load -o              \ 
    242242              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
    243243         done 
    244244        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
    245245else 
    246         ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     246        ld -dynamic -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
    247247endif 
    248248        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \