From bccb9adbe662c53d3e298ba9c7875bfd3f29f090 Mon Sep 17 00:00:00 2001 From: Pierre-Francois Loos Date: Fri, 13 Nov 2020 17:06:10 +0100 Subject: [PATCH] Fixed ar for MacOS --- src/makefile.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/makefile.py b/src/makefile.py index 5f2e338..6c6689d 100644 --- a/src/makefile.py +++ b/src/makefile.py @@ -35,6 +35,15 @@ FILENAME = "Makefile" FILENAME_GITIGNORE = ".gitignore" IRPF90_MAKE = "irpf90.make" +if sys.platform in ["linux", "linux2"]: + AR = "ar crs" +elif sys.platform == "darwin": + AR = "libtool -static -o" +else: + print("Unknown platform. Only Linux and Darwin are supported.") + sys.exit(-1) + + ###################################################################### def create(): has_makefile = True @@ -49,7 +58,7 @@ def create(): FC = gfortran FCFLAGS= -O2 -ffree-line-length-none -I . NINJA = ninja -AR = ar +AR = %s RANLIB = ranlib SRC= @@ -61,7 +70,7 @@ export %s: $(filter-out %s%%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile \t$(IRPF90) -"""%(IRPF90_MAKE,IRPF90_MAKE,irpdir) +"""%(AR,IRPF90_MAKE,IRPF90_MAKE,irpdir) file.write(t) file.close() create_gitignore() @@ -188,7 +197,7 @@ def run_make(): print(dir+"%.o: %.F\n\t$(FC) $(FCFLAGS) -c $*.F -o "+dir+"$*.o", file=file) print(dir+"%.irp.F90: "+IRPF90_MAKE+"\n", file=file) print("move:\n\t@mv -f *.mod IRPF90_temp/ 2> /dev/null | DO_NOTHING=\n", file=file) - print("IRPF90_temp/irpf90.a: $(OBJ) $(OBJ1)\n\t$(AR) crf IRPF90_temp/irpf90.a $(OBJ1)\n", file=file) + print("IRPF90_temp/irpf90.a: $(OBJ) $(OBJ1)\n\t$(AR) IRPF90_temp/irpf90.a $(OBJ1)\n", file=file) print("clean:\n\trm -rf $(EXE) $(OBJ1) IRPF90_temp/irpf90.a $(ALL_OBJ1) $(ALL)\n", file=file) print("veryclean:\n\t- $(MAKE) clean\n", file=file) print("\t- rm -rf "+irpdir+" "+mandir+" "+IRPF90_MAKE+" irpf90_entities dist tags\n", file=file)