build: support some non-standard ar variants
This adds support for the TI and Microsoft (lib.exe) variants of the ar utility. Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
		
							parent
							
								
									b16d001b62
								
							
						
					
					
						commit
						3dbc777c7f
					
				
							
								
								
									
										13
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@ -2415,6 +2415,17 @@ if [ -z "$CC_DEPFLAGS" ] && [ "$dep_cc" != "$cc" ]; then
 | 
			
		||||
    DEPCCFLAGS=$_flags
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if $ar 2>&1 | grep -q Microsoft; then
 | 
			
		||||
    arflags="-nologo"
 | 
			
		||||
    ar_o='-out:$@'
 | 
			
		||||
elif $ar 2>&1 | grep -q 'Texas Instruments'; then
 | 
			
		||||
    arflags="rq"
 | 
			
		||||
    ar_o='$@'
 | 
			
		||||
else
 | 
			
		||||
    arflags="rc"
 | 
			
		||||
    ar_o='$@'
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
add_cflags $extra_cflags
 | 
			
		||||
add_asflags $extra_cflags
 | 
			
		||||
 | 
			
		||||
@ -3645,6 +3656,8 @@ DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
 | 
			
		||||
YASM=$yasmexe
 | 
			
		||||
DEPYASM=$yasmexe
 | 
			
		||||
AR=$ar
 | 
			
		||||
ARFLAGS=$arflags
 | 
			
		||||
AR_O=$ar_o
 | 
			
		||||
RANLIB=$ranlib
 | 
			
		||||
LN_S=$ln_s
 | 
			
		||||
CPPFLAGS=$CPPFLAGS
 | 
			
		||||
 | 
			
		||||
@ -25,7 +25,7 @@ $(TESTOBJS): CPPFLAGS += -DTEST
 | 
			
		||||
 | 
			
		||||
$(SUBDIR)$(LIBNAME): $(OBJS)
 | 
			
		||||
	$(RM) $@
 | 
			
		||||
	$(AR) rc $@ $^ $(EXTRAOBJS)
 | 
			
		||||
	$(AR) $(ARFLAGS) $(AR_O) $^ $(EXTRAOBJS)
 | 
			
		||||
	$(RANLIB) $@
 | 
			
		||||
 | 
			
		||||
install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user