Skip to content

Commit a484e5d

Browse files
committed
Fix env var MACOSX_DEPLOYMENT_TARGET to work properly in configure script
1 parent ebc0273 commit a484e5d

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ addons:
2323

2424
env:
2525
- MACOSX_DEPLOYMENT_TARGET=10.8
26-
XCODEFLAGS="MACOSX_DEPLOYMENT_TARGET=10.8"
2726
VERSIONER_PERL_VERSION=5.18
2827
VERSIONER_PYTHON_VERSION=2.7
2928
vi_cv_path_python=/usr/bin/python

src/auto/configure

+3-1
Original file line numberDiff line numberDiff line change
@@ -4708,6 +4708,8 @@ rm -f core conftest.err conftest.$ac_objext \
47084708
if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
47094709
macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
47104710
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target"
4711+
else
4712+
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
47114713
fi
47124714
fi
47134715

@@ -9183,7 +9185,7 @@ $as_echo "no GUI support" >&6; }
91839185
SKIP_MACVIM=YES ;;
91849186
yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5
91859187
$as_echo "yes/auto - automatic GUI support" >&6; }
9186-
gui_auto=yes
9188+
gui_auto=yes
91879189
SKIP_CARBON=YES ;;
91889190
carbon) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Carbon GUI support" >&5
91899191
$as_echo "Carbon GUI support" >&6; }

src/configure.ac

+2
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
236236
if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
237237
macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([[0-9]]*\.[[0-9]]*\).*/\1/'`
238238
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target"
239+
else
240+
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
239241
fi
240242
fi
241243

0 commit comments

Comments
 (0)