Changeset 1506 for trunk/Config.kmk

Timestamp:

Apr 9, 2008, 2:22:07 AM (17 years ago)

Author:

bird

Message:

Environment / global variable renaming.

File:

• trunk/Config.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -81 +81 @@
 TEMPLATE_BIN_INCS               = $(PATH_ROOT)/src/lib
 
-ifeq ($(BUILD_TARGET),os2)
+ifeq ($(KBUILD_TARGET),os2)
 TEMPLATE_BIN_TOOL               = GCC3OMF
 TEMPLATE_BIN_CFLAGS             = -g
@@ -94 +94 @@
 endif
 
-ifeq ($(BUILD_TARGET),darwin)
+ifeq ($(KBUILD_TARGET),darwin)
 TEMPLATE_BIN_TOOL               = GCC4MACHO
 TEMPLATE_BIN_CFLAGS             = -g
@@ -104 +104 @@
 TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
  else
-TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/
+TEMPLATE_BIN_INST               = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
  endif
 endif
 
-ifeq ($(filter-out win nt,$(BUILD_TARGET)),)
- ifeq ($(BUILD_TARGET_ARCH),x86)
-  include $(PATH_KBUILD)/tools/VCC70.kmk        # fixme! template expanding does something bad to _LIBS /me thinks.
+ifeq ($(filter-out win nt,$(KBUILD_TARGET)),)
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
+  include $(KBUILD_PATH)/tools/VCC70.kmk        # fixme! template expanding does something bad to _LIBS /me thinks.
   TEMPLATE_BIN_TOOL             = VCC70
   TEMPLATE_BIN_DEFS             = WINDOWS32 _CONSOLE __WIN__ WIN32 __WIN32__
- else ifeq ($(BUILD_TARGET_ARCH),amd64)
+ else ifeq ($(KBUILD_TARGET_ARCH),amd64)
   TEMPLATE_BIN_TOOL             = VCC80AMD64
   TEMPLATE_BIN_DEFS             = WINDOWS32 _CONSOLE __WIN__ WIN32 __WIN32__ __WIN64__ WIN64 \
@@ -141 +141 @@
  #      $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcprt.lib - avoid this to save space!
  endif
- TEMPLATE_BIN_LIBS.profile      = Y:/coding/libc/svn/trunk/out/win.$(BUILD_TARGET_ARCH)/debug/kStuff/lib/kPrf2.lib
+ TEMPLATE_BIN_LIBS.profile      = Y:/coding/libc/svn/trunk/out/win.$(KBUILD_TARGET_ARCH)/debug/kStuff/lib/kPrf2.lib
  ifdef NIX_INSTALL_DIR
  TEMPLATE_BIN_INST              = $(NIX_INSTALL_DIR_BIN)/
  else
- TEMPLATE_BIN_INST              = kBuild/bin/win.$(BUILD_TARGET_ARCH)/
+ TEMPLATE_BIN_INST              = kBuild/bin/win.$(KBUILD_TARGET_ARCH)/
  endif
 endif
@@ -151 +151 @@
 ifndef TEMPLATE_BIN_TOOL
  # Use GCC3 when we're certain that the system is using GNU ld and ar.
- ifeq ($(filter-out linux freebsd openbsd netbsd,$(BUILD_TARGET)),)
+ ifeq ($(filter-out linux freebsd openbsd netbsd,$(KBUILD_TARGET)),)
   TEMPLATE_BIN_TOOL              = GCC3
  else
@@ -159 +159 @@
  TEMPLATE_BIN_LDFLAGS           = -g
  TEMPLATE_BIN_CFLAGS.release    = -O3
- ifeq ($(BUILD_TARGET),freebsd)
+ ifeq ($(KBUILD_TARGET),freebsd)
   TEMPLATE_BIN_INCS            += $(PATH_GNUMAKE_SRC)/glob /usr/local/include
  endif
- ifeq ($(BUILD_TARGET),linux)
+ ifeq ($(KBUILD_TARGET),linux)
   TEMPLATE_BIN_LIBS            += rt
  endif
- ifeq ($(BUILD_TARGET),solaris)
+ ifeq ($(KBUILD_TARGET),solaris)
   TEMPLATE_BIN_CFLAGS.x86      += -m32
   TEMPLATE_BIN_CFLAGS.amd64    += -m64
@@ -178 +178 @@
   TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
  else
-  TEMPLATE_BIN_INST             = kBuild/bin/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/
+  TEMPLATE_BIN_INST             = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
  endif
 endif