Changeset 18992

Show
Ignore:
Timestamp:
07/08/06 15:31:27 (2 years ago)
Author:
patrick
Message:

Finished the universal binary support on Mac OS X by enabling it for the
profiled library build.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/sonix/Makefile.inc.in

    r18972 r18992  
    211211        @$(SHELL) $(MKINSTALLDIRS) $(LIBDIR) 
    212212ifeq (@PLATFORM@, Darwin) 
    213         ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@)    \ 
    214           $(OBJS) 
     213ifeq ($(ISA), universal) 
     214        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
     215            ld -arch $$a -dynamic -m -r -d -bind_at_load -o             \ 
     216              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
     217         done 
     218        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
     219else 
     220        ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     221endif 
    215222        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \ 
    216223          -Wl,-ldylib1.o $(LDOPTS) -o $@ $(subst .dylib,.lo,$@)         \ 
    217224          $(DYLIB_PROF_DEPS) 
    218         rm -f $(subst .dylib,.lo,$@) 
     225        rm -f $(@D)/*.lo 
    219226else 
    220227        $(CXX_DLL) $(LDOPTS) $(DYLIB_NAME_FLAG) $(OBJS) \