fixed the build for macos. Now Linux and MacOS share the same build system.

diff --git a/build/unix/build.mk b/build/unix/build.mk
index 645419e..b2e7100 100644 (file)
--- a/build/unix/build.mk
+++ b/build/unix/build.mk
@@ -2,11 +2,13 @@ all:
        +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) all
        +make -C $(SRCDIR)/rpa/build/unix/$(ARCHDIR) all
        +make -C $(SRCDIR)/rvm/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) all
+       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) all
        +make -C $(SRCDIR)/tests/testmisc/build/unix/$(ARCHDIR) all
        +make -C $(SRCDIR)/tests/testrpa/build/unix/$(ARCHDIR) all
+ifeq ($(OS), linux)
+       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) all
        +make -C $(SRCDIR)/tests/testrjs/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) all
+endif
 
 distclean: clean
        +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) distclean
@@ -17,16 +19,19 @@ distclean: clean
        +make -C $(SRCDIR)/tests/testrpa/build/unix/$(ARCHDIR) distclean
        +make -C $(SRCDIR)/tests/testrjs/build/unix/$(ARCHDIR) distclean
        +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) distclean
+       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) distclean
+
 
 clean:
        +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) clean
        +make -C $(SRCDIR)/rpa/build/unix/$(ARCHDIR) clean
        +make -C $(SRCDIR)/rvm/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) clean
        +make -C $(SRCDIR)/tests/testmisc/build/unix/$(ARCHDIR) clean
        +make -C $(SRCDIR)/tests/testrpa/build/unix/$(ARCHDIR) clean
        +make -C $(SRCDIR)/tests/testrjs/build/unix/$(ARCHDIR) clean
        +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) clean
+       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) clean
+
 
 $(RPATK_INC_INSTALL) :
        mkdir $(RPATK_INC_INSTALL)

diff --git a/rgrep/build/unix/rgrep.mk b/rgrep/build/unix/rgrep.mk
index f6db266..5afd43b 100644 (file)
--- a/rgrep/build/unix/rgrep.mk
+++ b/rgrep/build/unix/rgrep.mk
@@ -4,12 +4,16 @@ RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 RGREP_SRCDIR = $(SRCDIR)/rgrep
 INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
+ifeq ($(OS), linux)
+LDFLAGS += --static
+endif
 
 
 LIBS = -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
-LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
+LIBS += -lrpa -lrvm -lrlib -lpthread -lm
+
 OBJECTS        = $(OUTDIR)/rpagrep.o $(OUTDIR)/main.o $(OUTDIR)/fsenum.o $(OUTDIR)/rpagrepdep.o $(OUTDIR)/rpagreputf.o
 RPAGREP        = rgrep
 
@@ -17,7 +21,7 @@ RPAGREP       = rgrep
 all : $(OUTDIR) $(OUTDIR)/$(RPAGREP)
 
 $(OUTDIR)/$(RPAGREP) : $(OBJECTS)
-       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+       $(CC) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 $(OUTDIR)/%.o: $(RGREP_SRCDIR)/%.c

diff --git a/tests/testmisc/build/unix/misc-tests.mk b/tests/testmisc/build/unix/misc-tests.mk
index 7b71833..f137abe 100644 (file)
--- a/tests/testmisc/build/unix/misc-tests.mk
+++ b/tests/testmisc/build/unix/misc-tests.mk
@@ -5,12 +5,14 @@ RPA_SRCDIR = $(SRCDIR)/rpa
 RAST_SRCDIR = $(SRCDIR)/rast
 TESTS_SRCDIR = $(SRCDIR)/tests/testmisc
 INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR) -I$(RPA_SRCDIR)
+ifeq ($(OS), linux)
+LDFLAGS += --static
+endif
 
-LIBS =  -L$(ROBJECT_SRCDIR)/build/unix/$(ARCHDIR)/out 
-LIBS += -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS = -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
-LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
+LIBS += -lrpa -lrvm -lrlib -lpthread -lm
 
 
 TESTS  += $(OUTDIR)/funcarg-test
@@ -52,7 +54,7 @@ TESTS   += $(OUTDIR)/asm-eadd
 all : $(OUTDIR) $(TESTS)
 
 $(OUTDIR)/%: $(TESTS_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LIBS) $(INCLUDE)
+       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LIBS) $(LDFLAGS) $(INCLUDE)
 
 
 $(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa

diff --git a/tests/testrjs/build/unix/testrjs.mk b/tests/testrjs/build/unix/testrjs.mk
index 8417620..12ea8e3 100644 (file)
--- a/tests/testrjs/build/unix/testrjs.mk
+++ b/tests/testrjs/build/unix/testrjs.mk
@@ -5,13 +5,16 @@ RPA_SRCDIR = $(SRCDIR)/rpa
 RJS_SRCDIR = $(SRCDIR)/rjs
 TESTS_SRCDIR = $(SRCDIR)/tests/testrjs
 INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR)
+ifeq ($(OS), linux)
+LDFLAGS += --static
+endif
 
 LIBS =  -L$(ROBJECT_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RJS_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
-LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm --static
+LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm
 
 
 TESTS   += $(OUTDIR)/rjs-simple
@@ -22,7 +25,7 @@ all : $(OUTDIR) $(TESTS)
 
 
 $(OUTDIR)/%: $(TESTS_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  $(LIBS) $(INCLUDE)
+       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  $(LIBS) $(LDFLAGS) $(INCLUDE)
 
 
 $(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa

diff --git a/tests/testrpa/build/unix/testrpa2.mk b/tests/testrpa/build/unix/testrpa2.mk
index 5d554a0..a494d7f 100644 (file)
--- a/tests/testrpa/build/unix/testrpa2.mk
+++ b/tests/testrpa/build/unix/testrpa2.mk
@@ -3,12 +3,14 @@ RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 TESTS_SRCDIR = $(SRCDIR)/tests/testrpa
 INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR)
-
+ifeq ($(OS), linux)
+LDFLAGS += --static
+endif
 
 LIBS = -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
-LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
+LIBS += -lrpa -lrvm -lrlib -lpthread -lm
 
 
 TESTS  += $(OUTDIR)/rpavm-matchchr
@@ -32,7 +34,7 @@ all : $(OUTDIR) $(TESTS)
 
 
 $(OUTDIR)/%: $(TESTS_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  -lrpa $(LIBS) $(INCLUDE)
+       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  -lrpa $(LIBS) $(LDFLAGS) $(INCLUDE)
 
 
 $(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa