Skip to content

Commit 5ee5e37

Browse files
committed
Configuration OS X: pass CPICFLAGS to build of libssh2
Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
1 parent c21fed5 commit 5ee5e37

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3591,6 +3591,7 @@ CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
35913591
CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
35923592
CPPFLAGS="${GIT2R_CPPFLAGS} ${CPPFLAGS}"
35933593
LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
3594+
CPICFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
35943595

35953596
# Check for zlib
35963597
have_zlib=no
@@ -3843,7 +3844,7 @@ if test "x${have_ssh2}" = xno; then
38433844
./configure --with-pic --with-openssl --disable-examples-build \
38443845
--disable-shared --enable-static \
38453846
--prefix=$LIBSSH2_INST_DIR CC="${CC}" \
3846-
CFLAGS="${CFLAGS} -Wno-deprecated-declarations" \
3847+
CFLAGS="${CFLAGS} ${CPICFLAGS} -Wno-deprecated-declarations" \
38473848
CPPFLAGS="${CPPFLAGS}" LDFLAGS=${LDFLAGS} \
38483849
&& make && make install && have_ssh2=yes
38493850
cd ..

configure.ac

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# git2r, R bindings to the libgit2 library.
2-
# Copyright (C) 2013-2014 The git2r contributors
2+
# Copyright (C) 2013-2015 The git2r contributors
33
#
44
# This program is free software; you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License, version 2,
@@ -110,6 +110,7 @@ CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
110110
CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
111111
CPPFLAGS="${GIT2R_CPPFLAGS} ${CPPFLAGS}"
112112
LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
113+
CPICFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
113114

114115
# Check for zlib
115116
have_zlib=no
@@ -181,7 +182,7 @@ if test "x${have_ssh2}" = xno; then
181182
./configure --with-pic --with-openssl --disable-examples-build \
182183
--disable-shared --enable-static \
183184
--prefix=$LIBSSH2_INST_DIR CC="${CC}" \
184-
CFLAGS="${CFLAGS} -Wno-deprecated-declarations" \
185+
CFLAGS="${CFLAGS} ${CPICFLAGS} -Wno-deprecated-declarations" \
185186
CPPFLAGS="${CPPFLAGS}" LDFLAGS=${LDFLAGS} \
186187
&& make && make install && have_ssh2=yes
187188
cd ..

0 commit comments

Comments
 (0)