[Relocatable] Follow-up 14: Fix C library options for win32unix #229
Conversation
This file contains hidden or 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
dra27
added
no-change-entry-needed
dra27
force-pushed
the
win32unix-libopts
branch
from
59f97c5 to
689cfeb
Compare
dra27
changed the title
dra27
force-pushed
the
relocatable-testing
branch
from
3c8b5c1 to
2a7e0ad
Compare
dra27
force-pushed
the
win32unix-libopts
branch
from
689cfeb to
d325289
Compare
dra27
force-pushed
the
win32unix-libopts
branch
from
d325289 to
c737f28
Compare
dra27
force-pushed
the
win32unix-libopts
branch
from
c737f28 to
656a88a
Compare
dra27
force-pushed
the
win32unix-libopts
branch
from
656a88a to
b66fbdd
Compare
dra27
force-pushed
the
relocatable-testing
branch
from
d644c59 to
63922b2
Compare
dra27
force-pushed
the
win32unix-libopts
branch
from
b66fbdd to
093891b
Compare
dra27
force-pushed
the
relocatable-testing
branch
from
63922b2 to
198fcfd
Compare
dra27
force-pushed
the
win32unix-libopts
branch
from
093891b to
005fc21
Compare
dra27
force-pushed
the
relocatable-testing
branch
from
198fcfd to
56b115d
Compare
dra27
force-pushed
the
win32unix-libopts
branch
from
005fc21 to
70d140f
Compare
dra27
force-pushed
the
relocatable-testing
branch
from
56b115d to
5c4d9f3
Compare
-lws2_32 and -ladvapi32 are already supplied by default, so they don't need to be in unix.cma/unix.cmxa. However, they do need to be passed when building unix.cmxs, and they were previously acquired via unix.cmxa. Tweak the way LDOPTS is used in Makefile.otherlibs.common (which now is only used for the unix library) so that it's correctly passed to both ocamlopt and ocamlmklib.
dra27
force-pushed
the
win32unix-libopts
branch
from
70d140f to
8f0fb1a
Compare
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.
-lws2_32 and -ladvapi32 are already supplied by default, so they don't need to be in unix.cma/unix.cmxa. However, they do need to be passed when building unix.cmxs, and they were previously acquired via unix.cmxa. Tweak the way LDOPTS is used in Makefile.otherlibs.common (which now is only used for the unix library) so that it's correctly passed to both ocamlopt and ocamlmklib.