Merge from HEAD

KekenoBSD/src

Fork 0

Browse Source

This commit is contained in:

Baptiste Daroussin

2015-04-03 23:23:09 +00:00

parent 8cf263c843 ebfc641e4e

commit 4bf53d0b46

4107 changed files with 1000026 additions and 442559 deletions

									
										Makefile
									
		+2
		-2
	
												View File
												
				@@ -166,10 +166,10 @@ _MAKE=	PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=$

				# Guess machine architecture from machine type, and vice versa.

				.if !defined(TARGET_ARCH) && defined(TARGET)

				_TARGET_ARCH=	${TARGET:S/pc98/i386/}

				_TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}

				.elif !defined(TARGET) && defined(TARGET_ARCH) && \

				    ${TARGET_ARCH} != ${MACHINE_ARCH}

				_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/}

				_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/}

				.endif

				.if defined(TARGET) && !defined(_TARGET)

				_TARGET=${TARGET}