From b3ffe33818b3a9703e1416dbea778cdeec7b1a58 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Wed, 13 Jan 2016 14:42:47 +0300 Subject: [PATCH] [generator] Move -lz option to the tail of cc command --- tools/unix/generate_planet.sh | 6 +++--- tools/unix/generate_planet_routing.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index 1dc7b645fc..6aed313abd 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -220,9 +220,9 @@ fi if [ "$MODE" == "coast" ]; then putmode - [ ! -x "$OSMCTOOLS/osmconvert" ] && cc -x c -lz -O3 "$OMIM_PATH/tools/osmctools/osmconvert.c" -o "$OSMCTOOLS/osmconvert" - [ ! -x "$OSMCTOOLS/osmupdate" ] && cc -x c "$OMIM_PATH/tools/osmctools/osmupdate.c" -o "$OSMCTOOLS/osmupdate" - [ ! -x "$OSMCTOOLS/osmfilter" ] && cc -x c -O3 "$OMIM_PATH/tools/osmctools/osmfilter.c" -o "$OSMCTOOLS/osmfilter" + [ ! -x "$OSMCTOOLS/osmconvert" ] && cc -x c -O3 "$OMIM_PATH/tools/osmctools/osmconvert.c" -o "$OSMCTOOLS/osmconvert" -lz + [ ! -x "$OSMCTOOLS/osmupdate" ] && cc -x c "$OMIM_PATH/tools/osmctools/osmupdate.c" -o "$OSMCTOOLS/osmupdate" + [ ! -x "$OSMCTOOLS/osmfilter" ] && cc -x c -O3 "$OMIM_PATH/tools/osmctools/osmfilter.c" -o "$OSMCTOOLS/osmfilter" if [ -n "$OPT_DOWNLOAD" ]; then # Planet download is requested log "STATUS" "Step 0: Downloading and converting the planet" diff --git a/tools/unix/generate_planet_routing.sh b/tools/unix/generate_planet_routing.sh index 6767b1dfef..38c23d572a 100755 --- a/tools/unix/generate_planet_routing.sh +++ b/tools/unix/generate_planet_routing.sh @@ -39,7 +39,7 @@ if [ "$1" == "pbf" ]; then PLANET="${PLANET:-$HOME/planet/planet-latest.o5m}" OSMCTOOLS="${OSMCTOOLS:-$HOME/osmctools}" [ ! -d "$OSMCTOOLS" ] && OSMCTOOLS="$INTDIR" - [ ! -x "$OSMCTOOLS/osmconvert" ] && cc -x c -lz -O3 "$OMIM_PATH/tools/osmctools/osmconvert.c" -o "$OSMCTOOLS/osmconvert" + [ ! -x "$OSMCTOOLS/osmconvert" ] && cc -x c -O3 "$OMIM_PATH/tools/osmctools/osmconvert.c" -o "$OSMCTOOLS/osmconvert" -lz TMPBORDERS="$INTDIR/tmpborders" [ -d "$TMPBORDERS" ] && rm -r "$TMPBORDERS"