Skip to content

Commit f7136c7

Browse files
committed
Updated build
1 parent 19d4e2b commit f7136c7

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

make/system.mk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ ifndef PLATFORM
1010

1111
ifeq ($(BUILD_SYSTEM),Windows)
1212
PLATFORM := Windows
13-
endif
14-
ifeq ($(findstring BSD,$(BUILD_SYSTEM)),BSD)
13+
else ifeq ($(findstring OpenBSD,$(BUILD_SYSTEM)),OpenBSD)
14+
PLATFORM := OpenBSD
15+
else ifeq ($(findstring BSD,$(BUILD_SYSTEM)),BSD)
1516
PLATFORM := BSD
16-
endif
17-
ifeq ($(findstring Linux,$(BUILD_SYSTEM)),Linux)
17+
else ifeq ($(findstring Linux,$(BUILD_SYSTEM)),Linux)
1818
PLATFORM := Linux
19-
endif
20-
ifeq ($(findstring SunOS,$(BUILD_SYSTEM)),SunOS)
19+
else ifeq ($(findstring SunOS,$(BUILD_SYSTEM)),SunOS)
2120
PLATFORM := Solaris
2221
endif
2322
endif

make/tools.mk

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1+
# Determine tools
2+
ifeq ($(PLATFORM),OpenBSD)
3+
X_CC_TOOL := egcc
4+
X_CXX_TOOL := eg++
5+
X_AS_TOOL := gas
6+
else
7+
X_CC_TOOL := gcc
8+
X_CXX_TOOL := g++
9+
X_AS_TOOL := as
10+
endif
11+
112
# Define tool variables
2-
CC := gcc
3-
CXX := g++
13+
CC := $(X_CC_TOOL)
14+
CXX := $(X_CXX_TOOL)
15+
AS := $(X_AS_TOOL)
416
LD := ld
517
GIT := git
618
INSTALL := install
@@ -97,13 +109,14 @@ EXE_FLAGS := $(EXE_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections
97109
SO_FLAGS := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary $(FLAG_STDLIB) -fPIC
98110

99111
TOOL_VARS := \
100-
CC CXX LD GIT INSTALL \
112+
AS CC CXX LD GIT INSTALL \
101113
CFLAGS CXXFLAGS LDFLAGS EXE_FLAGS SO_FLAGS \
102114
INCLUDE
103115

104116
.PHONY: toolvars
105117
toolvars:
106118
@echo "List of tool variables:"
119+
@echo " AS Assembler tool"
107120
@echo " CC C compiler execution command line"
108121
@echo " CFLAGS C compiler build flags"
109122
@echo " CXX C++ compiler execution command line"

0 commit comments

Comments
 (0)