ACPI - Fix type-o which caused clock interrupts to stop working properly in C3.
[dragonfly.git] / Makefile.inc1
index 00b163d..dd0f629 100644 (file)
@@ -121,6 +121,13 @@ DESTDIRBASE?=              ${OBJTREE}${.CURDIR}
 
 # This sets the compiler we use to build the world/kernel with
 WORLD_CCVER?=  gcc41
+WORLD_BINUTILSVER?=    binutils217
+
+# temporary until everybody has converted to x86_64
+.if ${MACHINE_ARCH} == "amd64"
+MACHINE_ARCH=  x86_64
+.makeenv MACHINE_ARCH
+.endif
 
 TARGET_ARCH?=  ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == ${MACHINE_ARCH}
@@ -130,6 +137,12 @@ TARGET?=   ${TARGET_ARCH}
 .endif
 .if make(buildworld)
 BUILD_ARCH!=   sysctl -n hw.machine_arch
+
+# temporary until everybody has converted to x86_64
+.if ${BUILD_ARCH} == "amd64"
+BUILD_ARCH=    x86_64
+.endif
+
 .if ${MACHINE_ARCH} != ${BUILD_ARCH}
 .error To cross-build, set TARGET_ARCH.
 .endif
@@ -146,7 +159,7 @@ MACHINE_PLATFORM= pc32
 .if !defined(TARGET_PLATFORM)
 .if ${TARGET_ARCH} == "i386"
 TARGET_PLATFORM= pc32
-.elif ${TARGET_ARCH} == "amd64"
+.elif ${TARGET_ARCH} == "x86_64"
 TARGET_PLATFORM= pc64
 .else
 .error Unknown target architecture.
@@ -274,7 +287,8 @@ CROSSENV=   MAKEOBJDIRPREFIX=${WORLDDEST} \
                MACHINE_PLATFORM=${TARGET_PLATFORM} \
                OBJFORMAT_PATH=${CTOOLSDEST} \
                HOST_CCVER=${HOST_CCVER} \
-               CCVER=${WORLD_CCVER}
+               CCVER=${WORLD_CCVER} \
+               BINUTILSVER=${WORLD_BINUTILSVER}
 
 WMAKEENV=      ${CROSSENV} \
                DESTDIR=${WORLDDEST} \
@@ -492,7 +506,7 @@ KERNWARN=   yes
 .if ${TARGET_ARCH} == "i386"
 KERNCONF?=     GENERIC
 .else
-KERNCONF?=     AMD64_GENERIC
+KERNCONF?=     X86_64_GENERIC
 .endif
 .endif
 INSTKERNNAME?= kernel
@@ -794,7 +808,7 @@ _gcc44_cross= gnu/usr.bin/cc44
 _gcc44_tools= gnu/usr.bin/cc44/cc_prep gnu/usr.bin/cc44/cc_tools
 .endif
 _custom_cross= libexec/customcc
-_binutils= gnu/usr.bin/binutils217
+_binutils= gnu/usr.bin/${WORLD_BINUTILSVER}
 
 build-tools:
 .for _tool in ${_gcc41_tools} ${_gcc44_tools} ${_libkrb5} ${_share}