summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-10-29 22:16:44 -0400
committerDane Springmeyer <dane@mapbox.com>2014-10-29 22:16:44 -0400
commit22f67bb8ab6960e1263f0c85ba540ff96123540b (patch)
tree96caa026554c19252d5c90af7e24f314111068a1 /utils
parent761f753cbdba350411785ce4e82d4e843bf03224 (diff)
downloadqtlocation-mapboxgl-22f67bb8ab6960e1263f0c85ba540ff96123540b.tar.gz
start passing ldflags
Diffstat (limited to 'utils')
-rwxr-xr-xutils/mbgl-config/build.sh3
-rw-r--r--utils/mbgl-config/mbgl-config.template.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/utils/mbgl-config/build.sh b/utils/mbgl-config/build.sh
index 4fd4a93cfc..fe7cbdf60a 100755
--- a/utils/mbgl-config/build.sh
+++ b/utils/mbgl-config/build.sh
@@ -2,6 +2,8 @@
PREFIX=$1
PLATFORM=$2
+shift
+shift
VARIABLES="#!/bin/bash
@@ -9,6 +11,7 @@ VARIABLES="#!/bin/bash
CONFIG_MBGL_PREFIX=$PREFIX
CONFIG_MBGL_PLATFORM=$PLATFORM
+CONFIG_MBGL_LDFLAGS=\"$@\"
"
echo "$VARIABLES" | cat - utils/mbgl-config/mbgl-config.template.sh \
diff --git a/utils/mbgl-config/mbgl-config.template.sh b/utils/mbgl-config/mbgl-config.template.sh
index 2b1b1a1224..16b67b1f09 100644
--- a/utils/mbgl-config/mbgl-config.template.sh
+++ b/utils/mbgl-config/mbgl-config.template.sh
@@ -43,7 +43,7 @@ while test $# -gt 0; do
;;
--libs)
- echo -L${CONFIG_MBGL_PREFIX}/lib -lmbgl -lmbgl-${CONFIG_MBGL_PLATFORM} -lmbgl-headless
+ echo -L${CONFIG_MBGL_PREFIX}/lib -lmbgl -lmbgl-${CONFIG_MBGL_PLATFORM} -lmbgl-headless ${CONFIG_MBGL_LDFLAGS}
;;
--includedir)