Skip to content

Commit 432bb75

Browse files
committed
Updated build
1 parent 84f09b7 commit 432bb75

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

make/system.mk

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@ else
5353
endif
5454
BUILD_ARCH := $(if $(ARCHITECTURE),$(ARCHITECTURE),$(HOST_BUILD_ARCH))
5555

56+
ifeq ($(PLATFORM),Linux)
57+
OBJ_LDFLAGS_X86 = -m elf_i386
58+
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
59+
else ifeq ($(PLATFORM),BSD)
60+
OBJ_LDFLAGS_X86 = -m elf_i386
61+
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
62+
else ifeq ($(PLATFORM),Windows
63+
OBJ_LDFLAGS_X86 = -m i386pe
64+
OBJ_LDFLAGS_X86_64 = -m i386pep
65+
endif
66+
5667
# Set actual architecture for HOST and TARGET builds
5768
# The current architecture can be obtained by: gcc -Q --help=target
5869
define detect_architecture =
@@ -100,37 +111,37 @@ define detect_architecture =
100111
$(2)_NAME = x86_64
101112
$(2)_FAMILY = x86_64
102113
$(2)_CFLAGS := -march=x86-64 -m64
103-
$(2)_LDFLAGS := -m elf_x86_64
114+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
104115
else ifeq ($(patsubst %amd64%,amd64,$(1)),amd64)
105116
$(2)_NAME = x86_64
106117
$(2)_FAMILY = x86_64
107118
$(2)_CFLAGS := -march=x86-64 -m64
108-
$(2)_LDFLAGS := -m elf_x86_64
119+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
109120
else ifeq ($(patsubst %AMD64%,AMD64,$(1)),AMD64)
110121
$(2)_NAME = x86_64
111122
$(2)_FAMILY = x86_64
112123
$(2)_CFLAGS := -march=x86-64 -m64
113-
$(2)_LDFLAGS := -m elf_x86_64
124+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
114125
else ifeq ($(1),i86pc)
115126
$(2)_NAME = x86_64
116127
$(2)_FAMILY = x86_64
117128
$(2)_CFLAGS := -march=x86-64 -m64
118-
$(2)_LDFLAGS := -m elf_x86_64
129+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
119130
else ifeq ($(patsubst %i686%,i686,$(1)),i686)
120131
$(2)_NAME = i686
121132
$(2)_FAMILY = ia32
122133
$(2)_CFLAGS := -march=i686 -m32
123-
$(2)_LDFLAGS := -m elf_i386
134+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
124135
else ifeq ($(patsubst i%86,i586,$(1)),i586)
125136
$(2)_NAME = i586
126137
$(2)_FAMILY = ia32
127138
$(2)_CFLAGS := -march=i586 -m32
128-
$(2)_LDFLAGS := -m elf_i386
139+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
129140
else ifeq ($(1),x86)
130141
$(2)_NAME = i686
131142
$(2)_FAMILY = ia32
132143
$(2)_CFLAGS := -march=i686 -m32
133-
$(2)_LDFLAGS := -m elf_i386
144+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
134145
else ifeq ($(1),riscv32)
135146
$(2)_NAME = riscv32
136147
$(2)_FAMILY = riscv32

0 commit comments

Comments
 (0)