(svn r27727) -Fix(-or-not) [FS#6295]: [OSX] Out-of-the-box compilation on newer OSX versions (dunn).
This commit is contained in:
		
							
								
								
									
										17
									
								
								config.lib
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								config.lib
									
									
									
									
									
								
							@@ -1611,23 +1611,6 @@ make_cflags_and_ldflags() {
 | 
				
			|||||||
			CFLAGS="$OSX_SYSROOT $CFLAGS"
 | 
								CFLAGS="$OSX_SYSROOT $CFLAGS"
 | 
				
			||||||
			LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
 | 
								LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
 | 
				
			||||||
		fi
 | 
							fi
 | 
				
			||||||
 | 
					 | 
				
			||||||
		if [ "$enable_universal" = "0" ] && [ $cc_version -gt 400 ]; then
 | 
					 | 
				
			||||||
			# Only set the min version when not doing an universal build.
 | 
					 | 
				
			||||||
			# Universal builds set the version elsewhere.
 | 
					 | 
				
			||||||
			if [ "$cpu_type" = "64" ]; then
 | 
					 | 
				
			||||||
				CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
 | 
					 | 
				
			||||||
			else
 | 
					 | 
				
			||||||
				gcc_cpu=`$cc_host -dumpmachine`
 | 
					 | 
				
			||||||
				if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then
 | 
					 | 
				
			||||||
					# PowerPC build can run on 10.3
 | 
					 | 
				
			||||||
					CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
 | 
					 | 
				
			||||||
				else
 | 
					 | 
				
			||||||
					# Intel is only available starting from 10.4
 | 
					 | 
				
			||||||
					CFLAGS="$CFLAGS -mmacosx-version-min=10.4"
 | 
					 | 
				
			||||||
				fi
 | 
					 | 
				
			||||||
			fi
 | 
					 | 
				
			||||||
		fi
 | 
					 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
 | 
						if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user