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

Towards autoconf #3: ocamlmklib and INT64_LITERAL #2113

Merged
merged 4 commits into from Oct 23, 2018

Conversation

@shindere
Copy link
Contributor

commented Oct 22, 2018

Cc-ing @pgraverdy who may be interested in following this

This PR continues the story started with GRPs #2044 and #2059. It
contains two changes:

  1. In tools/: move the definitions of the syslib and mklib functions
    from ocamlmklibconfig.ml to ocamlmklib.ml.

  2. In the runtime: move the definition of the INT64_LITERAL C
    preprocessor macro from the generated file m.h to config.h.

The first change simplifies the generation of
tools/ocamlmklibconfig.ml: the special comments starting with #ml
which were used to include these functions in Makefile.config and the
sed commands required to extract them are no longer necessary.

Same goes for the second change.

@xavierleroy
Copy link
Contributor

left a comment

Looks good to me.

let mklib out files opts =
if Config.ccomp_type = "msvc"
then
let machine =

This comment has been minimized.

Copy link
@xavierleroy

xavierleroy Oct 22, 2018

Contributor

This then on a line by itself is not the house style.

shindere added some commits Oct 22, 2018

Remove useless lines from the Windows configuration makefiles
The OCaml definitions of topdir and wintopdir were actually
never used. It can be seen that the Unix configure script does not
define such variables.

@shindere shindere force-pushed the shindere:towards-autoconf-3 branch from e52971d to e473b67 Oct 23, 2018

@shindere

This comment has been minimized.

Copy link
Contributor Author

commented Oct 23, 2018

@shindere shindere merged commit e473b67 into ocaml:trunk Oct 23, 2018

2 of 4 checks passed

continuous-integration/appveyor/branch Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@shindere shindere deleted the shindere:towards-autoconf-3 branch Oct 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.