Skip to content

try to fix dj32 build on arm #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stsp merged 1 commit into from
Jun 20, 2026
+12 −3
Merged

try to fix dj32 build on arm #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/32/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PRJ = comcom32
TOOLC = dj32
STRIP = djstrip
DJSTRIP = djstrip
srcdir ?= ..
include ../makefile.inc
2 changes: 1 addition & 1 deletion src/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRJ = comcom64
TOOLC = dj64
STRIP = @true
DJSTRIP = @true
include makefile.inc
11 changes: 10 additions & 1 deletion src/makefile.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,19 @@ ifeq ($(DJ64STATIC),1)
DJCFLAGS += -DSTATIC_LINK
endif

ifeq ($(TOOLC),dj32)
ifneq ($(CROSS_PREFIX),)
# for djlink on arm
export READELF = $(CROSS_PREFIX)readelf
export OBJCOPY = $(CROSS_PREFIX)objcopy
export STRIP = $(CROSS_PREFIX)strip
endif
endif

ifneq ($(LINK),)
$(RCMD): $(DJ64_XLIB)
$(srcdir)/link.sh $(LINK) $^ $(DBG) $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@

info: $(RCMD)
djstubify -i $<
Expand Down