Skip to content

Commit 9a5141a

Browse files
committed
Fix ewlink and GitHub CI
1 parent a427136 commit 9a5141a

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/ow-libc.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ jobs:
4747
working-directory: libc
4848
run: |
4949
make -f watcom.mk clean
50-
make -f watcom.mk
50+
make -f watcom.mk MODEL=c
51+
make -f watcom.mk MODEL=s
52+
make -f watcom.mk MODEL=m
53+
make -f watcom.mk MODEL=l
5154
- name: build ELKS sample
5255
working-directory: elkscmd/basic
5356
run: |

elks/tools/objtools/ewlink

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ fi
2424

2525
ELKSLIBC=$TOPDIR/libc
2626

27+
source $TOPDIR/libc/watcom.model
28+
2729
# wlink options for debugging:
2830
# -Wl,option -Wl,map # produce mapfile (or use -fm=file.map)
2931
# -Wl,option -Wl,verbose # more detail in mapfile
@@ -38,7 +40,7 @@ LDFLAGS="\
3840
-Wl,option -Wl,nodefaultlibs \
3941
-Wl,option -Wl,stack=0x1000 \
4042
-Wl,option -Wl,heapsize=0x1000 \
41-
-Wl,library -Wl,$TOPDIR/libc/libc.lib \
43+
-Wl,library -Wl,$TOPDIR/libc/libc$MODEL.lib \
4244
"
4345

4446
while true; do

0 commit comments

Comments
 (0)