diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2015-08-18 15:16:16 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2015-08-18 15:16:16 +0000 |
| commit | 08d7a9d403f1731cd8f7c194097e1a83f5fb1713 (patch) | |
| tree | 2a603b90201cf0d16575ad5a6b137c2b0cb3f2a1 /tools | |
| parent | 2b809f3d7dde03f15c73caa3846b4a218777e310 (diff) | |
| download | ocaml-08d7a9d403f1731cd8f7c194097e1a83f5fb1713.tar.gz | |
ci-build: allow special characters in conf options
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16361 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/ci-build b/tools/ci-build index 1d5af1d42e..31a2540351 100755 --- a/tools/ci-build +++ b/tools/ci-build @@ -28,6 +28,10 @@ error () { exit 3 } +quote1 () { + printf "'%s'" "`printf %s "$1" | sed -e "s/'/'\\\\\\\\''/g"`"; +} + ######################################################################### # be verbose set -x @@ -131,7 +135,7 @@ cd "$workdir" confoptions="" while [ $# -gt 0 ]; do case $1 in - -conf) confoptions="$confoptions $2"; shift 2;; + -conf) confoptions="$confoptions `quote1 "$2"`"; shift 2;; -patch1) patch -f -p1 <"$2"; shift 2;; *) error "unknown option $1";; esac @@ -150,7 +154,7 @@ if $docheckout; then fi case $nt in - "") ./configure -prefix "$instdir" $confoptions;; + "") eval "./configure -prefix '$instdir' $confoptions";; .nt) cp config/m-nt.h config/m.h cp config/s-nt.h config/s.h |