Skip to content

Commit b3ea7ad

Browse files
committed
Updated build
1 parent c865c0c commit b3ea7ad

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

make/system.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ COMMON_VARS = \
183183
PLATFORM \
184184
ARCHITECTURE \
185185
ARCHITECTURE_CFLAGS \
186+
BUILDDIR \
186187
FEATURES \
187188
LIBRARY_EXT \
188189
LIBRARY_PREFIX \
@@ -208,7 +209,9 @@ sysvars:
208209
echo " ADD_FEATURES list of features enabled in the build as an addition to default"
209210
echo " ARCHITECTURE target architecture to perform build"
210211
echo " ARCHITECTURE_CFLAGS compiler flags to specify architecture"
212+
echo " ARCHITECTURE_LDFLAGS linker flags to specify architecture"
211213
echo " BINDIR location of the binaries"
214+
echo " BUILDDIR location of the build directory"
212215
echo " DEBUG build with debug options"
213216
echo " DEVEL build with modules checked out for read/write URL"
214217
echo " ETCDIR location of system configuration files"

make/tools.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ else
3232
X_CXX_TOOL := g++
3333
X_AS_TOOL := as
3434
X_AR_TOOL := ar
35+
X_LD_TOOL := ld
36+
X_PKG_CONFIG := pkg-config
3537
endif
3638

3739
X_GIT_TOOL := git
@@ -64,7 +66,7 @@ FLAG_RELRO = -Wl,-z,relro,-z,now
6466
FLAG_STDLIB = -lc
6567
CFLAGS_EXT = $(ARCHITECTURE_CFLAGS)
6668
CXXFLAGS_EXT = $(ARCHITECTURE_CFLAGS)
67-
LDFLAGS_EXT =
69+
LDFLAGS_EXT = $(ARCHITECTURE_LDFLAGS)
6870

6971
ifeq ($(PLATFORM),Solaris)
7072
FLAG_RELRO =

src/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ $(CXX_OBJ_MAIN) $(CXX_OBJ_EXPORT) $(CXX_OBJ_EXT) $(CXX_OBJ_TEST) $(CXX_OBJ_NOTES
138138
# Producing large object files
139139
$(ARTIFACT_OBJ): $(CXX_OBJ)
140140
@echo " $($(HOST)LD) [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_OBJ))"
141-
@$($(HOST)LD) -o $(ARTIFACT_OBJ) -r $(CXX_OBJ)
141+
@$($(HOST)LD) -o $(ARTIFACT_OBJ) $($(HOST)LDFLAGS) $(CXX_OBJ)
142142

143143
$(ARTIFACT_OBJ_TEST): $(CXX_OBJ_TEST)
144144
echo " $($(HOST)LD) [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_OBJ_TEST))"
145-
$($(HOST)LD) -o $(ARTIFACT_OBJ_TEST) -r $(CXX_OBJ_TEST)
145+
$($(HOST)LD) -o $(ARTIFACT_OBJ_TEST) $($(HOST)LDFLAGS) $(CXX_OBJ_TEST)
146146

147147
# Linking
148148
all: $(ARTIFACT_TARGETS)

0 commit comments

Comments
 (0)