Changeset 1504 for trunk/kBuild/tools/GXX3.kmk

Timestamp:

Apr 9, 2008, 2:04:42 AM (17 years ago)

Author:

bird

Message:

Environment / global variable policy changes. Renamed the following but will continue to check for the old ones:
BUILD_TYPE -> KBUILD_TYPE
BUILD_TARGET -> KBUILD_TARGET
BUILD_TARGET_ARCH -> KBUILD_TARGET_ARCH
BUILD_TARGET_CPU -> KBUILD_TARGET_CPU
BUILD_PLATFORM -> KBUILD_HOST
BUILD_PLATFORM_ARCH -> KBUILD_HOST_ARCH
BUILD_PLATFORM_CPU -> KBUILD_HOST_CPU
PATH_KBUILD -> KBUILD_PATH
PATH_KBUILD_BIN -> KBUILD_BIN_PATH

File:

• trunk/kBuild/tools/GXX3.kmk (modified) (3 diffs)

trunk/kBuild/tools/GXX3.kmk

@@ -31 +31 @@
 TOOL_GXX3_CXX ?= g++$(HOSTSUFF_EXE)
 TOOL_GXX3_AS  ?= gcc$(HOSTSUFF_EXE)
-ifeq ($(BUILD_TARGET),solaris)
+ifeq ($(KBUILD_TARGET),solaris)
  TOOL_GXX3_AR ?= gar$(HOSTSUFF_EXE)
 else
  TOOL_GXX3_AR ?= ar$(HOSTSUFF_EXE)
 endif
-ifeq ($(BUILD_TARGET),os2)
+ifeq ($(KBUILD_TARGET),os2)
  TOOL_GXX3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
 else
@@ -43 +43 @@
 TOOL_GXX3_LD ?= g++$(HOSTSUFF_EXE)
 TOOL_GXX3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
-ifndef TOOL_GXX3_LDFLAGS.$(BUILD_TARGET)
+ifndef TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET)
  TOOL_GXX3_LDFLAGS.dll ?= -shared
 else
- TOOL_GXX3_LDFLAGS.dll ?= $(TOOL_GXX3_LDFLAGS.$(BUILD_TARGET))
+ TOOL_GXX3_LDFLAGS.dll ?= $(TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET))
 endif
 TOOL_GXX3_LDFLAGS.sysmod ?= -r
-TOOL_GXX3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
-ifeq ($(BUILD_TARGET),os2)
+TOOL_GXX3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
+ifeq ($(KBUILD_TARGET),os2)
  TOOL_GXX3_LD_MAP ?= -Zmap=$(1)
  TOOL_GXX3_LD_SYSMOD_MAP ?= -Zmap=$(1)
@@ -274 +274 @@
 define TOOL_GXX3_LINK_DLL_CMDS
         $(QUIET)$(TOOL_GXX3_LD) $(TOOL_GXX3_LDFLAGS.dll) $(flags) -o $(out)\
-                $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GXX3_LD_SONAME,$(target),$(out)))\
+                $(if $(filter-out win32 os2, $(KBUILD_TARGET)),$(call TOOL_GXX3_LD_SONAME,$(target),$(out)))\
                 $(objs)\
                 $(filter %.def, $(othersrc))\