View | Details | Raw Unified | Return to bug 273961 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/ssl.mk (-1 / +6 lines)
Lines 114-119 MAKE_ENV+= OPENSSLBASE=${OPENSSLBASE} Link Here
114
MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
114
MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
115
MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
115
MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
116
MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}
116
MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}
117
MAKE_ENV+=		OPENSSL_DIR="${OPENSSLBASE}"
118
MAKE_ENV+=		OPENSSL_ROOT_DIR=${OPENSSLBASE}
119
CONFIGURE_ENV+=		OPENSSL_DIR=${OPENSSLBASE}
120
CONFIGURE_ENV+=		OPENSSL_ROOT_DIR=${OPENSSLBASE}
117
121
118
.  if defined(OPENSSLRPATH)
122
.  if defined(OPENSSLRPATH)
119
.    if defined(USE_OPENSSL_RPATH)
123
.    if defined(USE_OPENSSL_RPATH)
Lines 123-128 MAKE_ENV+= OPENSSLRPATH=${OPENSSLRPATH} Link Here
123
OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
127
OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
124
.  endif
128
.  endif
125
129
126
LDFLAGS+=		${OPENSSL_LDFLAGS}
130
CFLAGS+=		-I${OPENSSLINC}
131
LDFLAGS+=		-L${OPENSSLLIB} ${OPENSSL_LDFLAGS}
127
132
128
.endif
133
.endif

Return to bug 273961