Skip to content

Commit 468d7b4

Browse files
jmalakPerditionC
authored andcommitted
build: fix OW support for cross-compile on Mac OSX
1 parent df83768 commit 468d7b4

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

mkfiles/watcom.mak

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
!ifdef __LINUX__
1+
!ifdef __UNIX__
22
DIRSEP = /
33
RMFILES = rm -f
44
ECHOTO = echo >>
@@ -9,7 +9,7 @@ LIBLIST = >
99
ECHOLIB = echo >>
1010
ECHOLIBDEP =
1111

12-
!ifdef __LINUX__
12+
!ifdef __UNIX__
1313
LD = $(CL) -l=dos -fe=command.exe $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LIBS) -\"op map,statics,verbose,stack=4k\"
1414
!else
1515
LD_RSP = command.rsp
@@ -35,6 +35,8 @@ CFLAGS1 = -os-s-wx
3535
! else
3636
$(CL) -ms -I$(WATCOM)$(DIRSEP)h $< -fm -fe=$@ -I..$(DIRSEP)suppl
3737
! endif
38+
! else ifdef __OSX__
39+
clang -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@
3840
! else
3941
$(CL386) -I$(WATCOM)$(DIRSEP)h $< -fm -fe=$@ -I..$(DIRSEP)suppl
4042
! endif

strings/fixstrs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static char *strupr(char *s)
7676
*p = toupper(*p);
7777
return s;
7878
}
79-
#elif defined(__WATCOMC__) && defined(__LINUX__)
79+
#elif defined(__WATCOMC__) && defined(__UNIX__)
8080
#include <unistd.h>
8181
#include <sys/stat.h>
8282
#define mkdir(x) mkdir(x, 0777)

0 commit comments

Comments
 (0)