Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile.nt: odoc_info.cma and cmxa contain objects outside of ocamldoc #6477

Closed
vicuna opened this issue Jul 4, 2014 · 3 comments
Closed
Assignees
Milestone

Comments

@vicuna
Copy link

vicuna commented Jul 4, 2014

Original bug ID: 6477
Reporter: furuse
Assigned to: @damiendoligez
Status: resolved (set by @xavierleroy on 2017-02-17T15:26:09Z)
Resolution: fixed
Priority: normal
Severity: minor
Version: 4.01.0
Target version: 4.05.0 +dev/beta1/beta2/beta3/rc1
Fixed in version: 4.05.0 +dev/beta1/beta2/beta3/rc1
Category: ocamldoc
Tags: patch

Bug description

ocamldoc/Makefile.nt seems not to be up-to-date compared with ocamldoc/Makefile. It builds odoc_info.cma and odoc_info.cmxa with objects outside of ocamldoc, for example, typing/ident.cm{o,x}. This prevents from linking odoc_info.cm{a,xa} and compierlibs altogether in "NT" environment, since the both implements module Ident.

@vicuna
Copy link
Author

vicuna commented Jul 4, 2014

Comment author: furuse

The following diff shows how to fix the linking issue of odoc_info and ocamlcommon. But probably you may want to compare Makefile and Makefile.nt for other unapplied updates to Makefile.nt.


*** ocamldoc/Makefile.nt~ Tue Oct 16 01:50:56 2012
--- ocamldoc/Makefile.nt Fri Jul 4 17:33:24 2014


*** 198,206 ****
$(OCAMLOPT) -o $@ unix.cmxa str.cmxa dynlink.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)

$(OCAMLDOC_LIBCMA): $(LIBCMOFILES)
! $(OCAMLC) -a -o $@ $(LINKFLAGS) $(OCAMLCMOFILES) $(LIBCMOFILES)
$(OCAMLDOC_LIBCMXA): $(LIBCMXFILES)
! $(OCAMLOPT) -a -o $@ $(LINKFLAGS) $(OCAMLCMXFILES) $(LIBCMXFILES)

Parsers and lexers dependencies :

###################################
--- 198,206 ----
$(OCAMLOPT) -o $@ unix.cmxa str.cmxa dynlink.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)

$(OCAMLDOC_LIBCMA): $(LIBCMOFILES)
! $(OCAMLC) -a -o $@ $(LINKFLAGS) $(OCAMLSRCDIR)/tools/depend.cmo $(LIBCMOFILES)
$(OCAMLDOC_LIBCMXA): $(LIBCMXFILES)
! $(OCAMLOPT) -a -o $@ $(LINKFLAGS) $(OCAMLSRCDIR)/tools/depend.cmx $(LIBCMXFILES)

Parsers and lexers dependencies :

###################################

@vicuna
Copy link
Author

vicuna commented Jul 21, 2014

Comment author: @damiendoligez

I have tried to make Makefile and Makefile.nt as similar as possible without breaking anything (commit 15015).

As far as I can tell, the only significant difference is $(MAKEREC) vs $(MAKE) and we should merge these two files, then make Makefile.nt simply include Makefile. Keeping the PR open to this end.

@vicuna
Copy link
Author

vicuna commented Feb 17, 2017

Comment author: @xavierleroy

The great Makefile unification finally occurred in 4.05.

@vicuna vicuna closed this as completed Feb 17, 2017
@vicuna vicuna added this to the 4.05.0 milestone Mar 14, 2019
@vicuna vicuna added the bug label Mar 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants