Changeset 128 for trunk/kBuild

Timestamp:

Jun 27, 2004, 11:22:30 PM (21 years ago)

Author:

bird

Message:

Hack for cross compiling on linux.

File:

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

trunk/kBuild/tools/MINGW32.kmk

@@ -29 +29 @@
 # find latest installed version
 ifndef PATH_TOOL_MINGW32                                                                  
-PATH_TOOL_MINGW32            := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/36mingw32/v*.*))
+PATH_TOOL_MINGW32            := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/mingw32/v*.*))
 ifeq ($(PATH_TOOL_MINGW32),)
 PATH_TOOL_MINGW32            := $(sort $(wildcard $(PATH_DEV)/x86.win32/mingw32/v*.*))
@@ -44 +44 @@
 endif
 _TOOL_MINGW32_SUFF_EXE          := $(HOSTSUFF_EXE)
-ifneq ($(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM),x86.win32)
+ifneq ($(BUILD_PLATFORM),win32)
+# we're cross compiling either using wine/odin or a cross compiler.
 ifneq ($(PATH_TOOL_MINGW32),$(subst x86.win32,,$(PATH_TOOL_MINGW32)))
 _TOOL_MINGW32_PREFIX            := $(EXEC_X86_WIN32) $(_TOOL_MINGW32_PREFIX)
 _TOOL_MINGW32_SUFF_EXE          := .exe
+else
+_TOOL_MINGW32_PREFIX            := $(_TOOL_MINGW32_PREFIX)i386-mingw32msvc-
+_TOOL_MINGW32_SUFF_EXE          := 
+_TOOL_MINGW32_XCOMPILE          := 1
 endif
 endif
@@ -77 +82 @@
 TOOL_MINGW32_ARLIBSUFF          := .a
 
+# The linux cross compiler ebuild haven't got g++, this is a hack for that.
+ifndef _TOOL_MINGW32_XCOMPILE
 TOOL_MINGW32_LD                 := $(_TOOL_MINGW32_PREFIX)g++$(_TOOL_MINGW32_SUFF_EXE)
+else
+TOOL_MINGW32_LD                 := $(_TOOL_MINGW32_PREFIX)gcc$(_TOOL_MINGW32_SUFF_EXE)
+endif
 TOOL_MINGW32_LDFLAGS            :=
 TOOL_MINGW32_LDFLAGS.debug      := -g