Add cross-compilation support #4
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xavierleroy
reviewed
Feb 11, 2017
Makefile
Outdated
|
|
||
| OBJS=zlib.cmo zip.cmo gzip.cmo | ||
| C_OBJS=zlibstubs.o | ||
|
|
||
| NATDYNLINK := $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi) | ||
| include $(shell ocamlfind ocamlc -where)/Makefile.config | ||
| NATDYNLINK := $(shell if [ -f `ocamlfind ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi) |
There was a problem hiding this comment.
If we are to include OCaml's Makefile.config, there is probably a simpler way to determine whether .cmxs files are supported.
Makefile
Outdated
| @@ -68,25 +69,25 @@ libcamlzip.a: $(C_OBJS) | |||
|
|
|||
| clean: | |||
| rm -f *.cm* | |||
| rm -f *.o *.a *.so | |||
| rm -f *.o *$(EXT_LIB) *$(EXT_DLL) | |||
|
|
|||
| install: | |||
| mkdir -p $(INSTALLDIR) | |||
There was a problem hiding this comment.
If we make ocamlfind mandatory, this legacy, ocamlfind-free "install" procedure should be removed.
Makefile
Outdated
| ldconf=`$(OCAMLC) -where`/ld.conf; \ | ||
| installdir=$(INSTALLDIR); \ | ||
| if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \ | ||
| then echo $$installdir >> $$ldconf; fi \ | ||
| fi | ||
|
|
||
| installopt: | ||
| cp zip.cmxa $(CMXS) zip.a zip.cmx gzip.cmx zlib.cmx $(INSTALLDIR) | ||
| cp zip.cmxa $(CMXS) zip$(EXT_LIB) zip.cmx gzip.cmx zlib.cmx $(INSTALLDIR) | ||
|
|
||
| install-findlib: | ||
| cp META-zip META && \ |
There was a problem hiding this comment.
And this one should also be called "install".
This commit replaces the hardcoded .a/.so extensions with the $(EXT_LIB)/$(EXT_DLL) variables, and runs the compilation commands through ocamlfind so that OCAMLFIND_TOOLCHAIN could be used by a cross-compilation repository.
|
All done, also fixed a stray ocamldep invocation. |
|
Ping |
|
Apologies for the delay. This was merged manually (to resolve a tiny Makefile conflict) in [master 0c28962]. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit replaces the hardcoded .a/.so extensions with$(EXT_LIB)/$ (EXT_DLL) variables, and runs the compilation
the
commands through ocamlfind so that OCAMLFIND_TOOLCHAIN could be
used by a cross-compilation repository.