configure: Put cross compile flags in EXTRA_CFLAGS
The cross compile CFLAGS are needed to properly build pixman (and any other submodules). Only the EXTRA_CFLAGS set is passed to submodules not QEMU_CFLAGS, so put the cross compile flags in EXTRA_CFLAGS instead. Signed-off-by: Peter Crosthwaite peter.crosthwaite@xilinx.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
		
							parent
							
								
									1773d9ee6e
								
							
						
					
					
						commit
						79f3b12f70
					
				
							
								
								
									
										15
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@ -941,33 +941,36 @@ done
 | 
				
			|||||||
case "$cpu" in
 | 
					case "$cpu" in
 | 
				
			||||||
    sparc)
 | 
					    sparc)
 | 
				
			||||||
           LDFLAGS="-m32 $LDFLAGS"
 | 
					           LDFLAGS="-m32 $LDFLAGS"
 | 
				
			||||||
           QEMU_CFLAGS="-m32 -mcpu=ultrasparc $QEMU_CFLAGS"
 | 
					           CPU_CFLAGS="-m32 -mcpu=ultrasparc"
 | 
				
			||||||
           ;;
 | 
					           ;;
 | 
				
			||||||
    sparc64)
 | 
					    sparc64)
 | 
				
			||||||
           LDFLAGS="-m64 $LDFLAGS"
 | 
					           LDFLAGS="-m64 $LDFLAGS"
 | 
				
			||||||
           QEMU_CFLAGS="-m64 -mcpu=ultrasparc $QEMU_CFLAGS"
 | 
					           CPU_CFLAGS="-m64 -mcpu=ultrasparc"
 | 
				
			||||||
           ;;
 | 
					           ;;
 | 
				
			||||||
    s390)
 | 
					    s390)
 | 
				
			||||||
           QEMU_CFLAGS="-m31 -march=z990 $QEMU_CFLAGS"
 | 
					           CPU_CFLAGS="-m31 -march=z990"
 | 
				
			||||||
           LDFLAGS="-m31 $LDFLAGS"
 | 
					           LDFLAGS="-m31 $LDFLAGS"
 | 
				
			||||||
           ;;
 | 
					           ;;
 | 
				
			||||||
    s390x)
 | 
					    s390x)
 | 
				
			||||||
           QEMU_CFLAGS="-m64 -march=z990 $QEMU_CFLAGS"
 | 
					           CPU_CFLAGS="-m64 -march=z990"
 | 
				
			||||||
           LDFLAGS="-m64 $LDFLAGS"
 | 
					           LDFLAGS="-m64 $LDFLAGS"
 | 
				
			||||||
           ;;
 | 
					           ;;
 | 
				
			||||||
    i386)
 | 
					    i386)
 | 
				
			||||||
           QEMU_CFLAGS="-m32 $QEMU_CFLAGS"
 | 
					           CPU_CFLAGS="-m32"
 | 
				
			||||||
           LDFLAGS="-m32 $LDFLAGS"
 | 
					           LDFLAGS="-m32 $LDFLAGS"
 | 
				
			||||||
           cc_i386='$(CC) -m32'
 | 
					           cc_i386='$(CC) -m32'
 | 
				
			||||||
           ;;
 | 
					           ;;
 | 
				
			||||||
    x86_64)
 | 
					    x86_64)
 | 
				
			||||||
           QEMU_CFLAGS="-m64 $QEMU_CFLAGS"
 | 
					           CPU_CFLAGS="-m64"
 | 
				
			||||||
           LDFLAGS="-m64 $LDFLAGS"
 | 
					           LDFLAGS="-m64 $LDFLAGS"
 | 
				
			||||||
           cc_i386='$(CC) -m32'
 | 
					           cc_i386='$(CC) -m32'
 | 
				
			||||||
           ;;
 | 
					           ;;
 | 
				
			||||||
    # No special flags required for other host CPUs
 | 
					    # No special flags required for other host CPUs
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS"
 | 
				
			||||||
 | 
					EXTRA_CFLAGS="$CPU_CFLAGS $EXTRA_CFLAGS"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
default_target_list=""
 | 
					default_target_list=""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# these targets are portable
 | 
					# these targets are portable
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user