Changeset 2246 in kBuild

Timestamp:

Jan 18, 2009 2:08:37 AM (16 years ago)

Author:

bird

Message:

GXX32,GCC32,GXX64,GCC64: FreeBSD ld doesn't do standard elf_<arch> but elf_<arch>_fbsd. (sysmod linking)

Location:

trunk/kBuild/tools

Files:

• GCC32.kmk (modified) (1 diff)
• GCC64.kmk (modified) (1 diff)
• GXX32.kmk (modified) (1 diff)
• GXX64.kmk (modified) (1 diff)
• TARGZ.kmk (modified) (1 diff)

trunk/kBuild/tools/GCC32.kmk

@@ -47 +47 @@
 TOOL_GCC32_LDFLAGS.dll ?= $(TOOL_GCC32_LDFLAGS.$(KBUILD_TARGET))
 endif
-TOOL_GCC32_LDFLAGS.sysmod ?= -r -m elf_i386
+TOOL_GCC32_LDFLAGS.sysmod ?= -r -m elf_i386$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
 TOOL_GCC32_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)

trunk/kBuild/tools/GCC64.kmk

@@ -47 +47 @@
 TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET))
 endif
-TOOL_GCC64_LDFLAGS.sysmod ?= -r -m elf_x86_64
+TOOL_GCC64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
 TOOL_GCC64_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)

trunk/kBuild/tools/GXX32.kmk

@@ -47 +47 @@
 TOOL_GXX32_LDFLAGS.dll ?= $(TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET))
 endif
-TOOL_GXX32_LDFLAGS.sysmod ?= -r -m elf_i386
+TOOL_GXX32_LDFLAGS.sysmod ?= -r -m elf_i386$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
 TOOL_GXX32_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)

trunk/kBuild/tools/GXX64.kmk

@@ -47 +47 @@
 TOOL_GXX64_LDFLAGS.dll ?= $(TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET))
 endif
-TOOL_GXX64_LDFLAGS.sysmod ?= -r -m elf_x86_64
+TOOL_GXX64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
 TOOL_GXX64_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)

trunk/kBuild/tools/TARGZ.kmk

@@ -65 +65 @@
 TOOL_TARGZ_UNPACK_DEPEND =
 TOOL_TARGZ_UNPACK_DEPORD =
+ifeq ($(KBUILD_HOST),win) # hacking with buggy unxutils on windows. it doesn't like driver letters.
+define TOOL_TARGZ_UNPACK_CMDS
+        $(QUIET)$(TOOL_TARGZ_UNPACK) -x $(flags) -C $(subst G:,,$(inst)) -f $(archive)
+        $(QUIET)$(TOOL_TARGZ_UNPACK) -t $(flags) -f $(archive) > $(out)
+endef
+else
 define TOOL_TARGZ_UNPACK_CMDS
         $(QUIET)$(TOOL_TARGZ_UNPACK) -x $(flags) -C $(inst) -f $(archive)
         $(QUIET)$(TOOL_TARGZ_UNPACK) -t $(flags) -f $(archive) > $(out)
 endef
+endif