Skip to content

Commit b975908

Browse files
committed
Revert #124
`-L/path/to/gmp/lib` must be passed as is to `ocamlmklib`, not behind a `-ldopt` flag, otherwise it is ignored in static linking situations.
1 parent 94f674e commit b975908

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Changes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Release 1.13 (2023-07-19)
77
- #118: fix Z_mlgmpidl interface for mlgmpidl >= 1.2 [Simmo Saan]
88
- #109: fix typo in `ml_z_mul` function [Bernhard Schommer]
99
- #108: fix dependency on C evaluation order in `ml_z_remove` [Xavier Clerc]
10-
- #117 #120 #124 #129 #132 #135 #139 #141: configure & build simplifications and fixes [various authors]
10+
- #117 #120 #129 #132 #135 #139 #141: configure & build simplifications and fixes [various authors]
1111
- #134: CI testing: add Windows, test both 4.14 and 5.0 [Hugo Heuzard]
1212

1313
Release 1.12 (2021-03-03)

project.mak

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ TOINSTALL += $(CMIDOC)
6262
OCAMLFLAGS += -bin-annot
6363
endif
6464

65-
MKLIBLDFLAGS = $(foreach flag, $(LDFLAGS), -ldopt $(flag))
66-
6765
# build targets
6866
###############
6967

@@ -73,16 +71,16 @@ tests:
7371
make -C tests test
7472

7573
zarith.cma: $(MLSRC:%.ml=%.cmo)
76-
$(OCAMLMKLIB) $(DEBUG) -failsafe -o zarith $+ $(LIBS) $(MKLIBLDFLAGS)
74+
$(OCAMLMKLIB) $(DEBUG) -failsafe -o zarith $+ $(LIBS) $(LDFLAGS)
7775

7876
zarith.cmxa: $(MLSRC:%.ml=%.cmx)
79-
$(OCAMLMKLIB) $(DEBUG) -failsafe -o zarith $+ $(LIBS) $(MKLIBLDFLAGS)
77+
$(OCAMLMKLIB) $(DEBUG) -failsafe -o zarith $+ $(LIBS) $(LDFLAGS)
8078

8179
zarith.cmxs: zarith.cmxa libzarith.$(LIBSUFFIX)
8280
$(OCAMLOPT) -shared -o $@ -I . zarith.cmxa -linkall
8381

8482
libzarith.$(LIBSUFFIX): $(CSRC:%.c=%.$(OBJSUFFIX))
85-
$(OCAMLMKLIB) $(DEBUG) -failsafe -o zarith $+ $(LIBS) $(MKLIBLDFLAGS)
83+
$(OCAMLMKLIB) $(DEBUG) -failsafe -o zarith $+ $(LIBS) $(LDFLAGS)
8684

8785
zarith_top.cma: zarith_top.cmo
8886
$(OCAMLC) $(DEBUG) -o $@ -a $<

0 commit comments

Comments
 (0)