projects
/
tatoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b866f48
)
Pass correct flag to ocamlopt to take care of PIE systems.
author
Kim Nguyễn
<kn@lri.fr>
Mon, 17 Apr 2017 12:17:21 +0000
(14:17 +0200)
committer
Kim Nguyễn
<kn@lri.fr>
Mon, 17 Apr 2017 12:17:21 +0000
(14:17 +0200)
configure.in
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index
297c4e5
..
0de71a1
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-190,7
+190,7
@@
AC_ARG_ENABLE([profile],
[PROFILE=no])
if test "x$PROFILE" = "xyes"; then
[PROFILE=no])
if test "x$PROFILE" = "xyes"; then
- OCAMLOPTFLAGS="$OCAMLOPTFLAGS -p"
+ OCAMLOPTFLAGS="$OCAMLOPTFLAGS -p
-ccopt -no-pie
"
OCAMLC="$OCAMLFIND ocamlcp"
fi
OCAMLC="$OCAMLFIND ocamlcp"
fi
@@
-211,13
+211,14
@@
AC_ARG_ENABLE([inline],
[INLINE=$enableval],
[INLINE=100])
[INLINE=$enableval],
[INLINE=100])
+OCAMLOPTFLAGS="$OCAMLOPTFLAGS -inline $INLINE"
#unsafe
AC_ARG_ENABLE([unsafe],
[ --enable-unsafe use unsafe array and string accesses],
[UNSAFE=1],
[UNSAFE=0])
#unsafe
AC_ARG_ENABLE([unsafe],
[ --enable-unsafe use unsafe array and string accesses],
[UNSAFE=1],
[UNSAFE=0])
-if test "x$UNSAFE" = "x
yes
"; then
+if test "x$UNSAFE" = "x
1
"; then
CAMLP4FLAGS="$CAMLP4FLAGS -unsafe"
fi
CAMLP4FLAGS="$CAMLP4FLAGS -unsafe"
fi
@@
-250,12
+251,10
@@
else
AC_MSG_NOTICE([$REMAKE exists, not rebuilding])
fi
AC_MSG_NOTICE([$REMAKE exists, not rebuilding])
fi
-
-AC_SUBST(INLINE)
AC_SUBST(OCAMLFLAGS)
AC_SUBST(OCAMLCFLAGS)
AC_SUBST(OCAMLOPTFLAGS)
AC_SUBST(CAMLP4FLAGS)
AC_SUBST(OCAMLFLAGS)
AC_SUBST(OCAMLCFLAGS)
AC_SUBST(OCAMLOPTFLAGS)
AC_SUBST(CAMLP4FLAGS)
-AC_CONFIG_FILES(Remakefile)
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(
Makefile
Remakefile)
+
AC_OUTPUT
AC_OUTPUT