Differences From
Artifact [defad12737]:
181 181 :
182 182 }
183 183
184 184 function postconfigure() {
185 185 :
186 186 }
187 187
188 -function configure() {
188 +function configure_gcc() {
189 189 glibcdir="/opt/appfs/core.appfs.rkeene.org/glibc/platform/latest"
190 + glibcdir="$(readlink -f "${glibcdir}")"
191 +
190 192 dynlinker="$(ls "${glibcdir}"/lib/ld-linux*.so.* | tail -n 1)"
191 193
192 194 if [ ! -f "${dynlinker}" ]; then
193 195 die 'glibc directory is not available (appfs running/working?)'
194 196 fi
195 197
196 198 CC="${CC:-gcc} -nostdinc -I${glibcdir}/include"
199 + BUILD_CC="${CC}"
200 + HOST_CC="${CC}"
197 201 LDFLAGS="${LDFLAGS} -Wl,--rpath,${glibcdir}/lib -Wl,--dynamic-linker,${dynlinker}"
198 202 PKG_CONFIG_LIBDIR="${glibcdir}/lib/pkgconfig"
199 - export LDFLAGS PKG_CONFIG_LIBDIR
203 + export CC BUILD_CC HOST_CC LDFLAGS PKG_CONFIG_LIBDIR
204 +}
200 205
206 +function configure() {
207 + configure_gcc
201 208 ./configure --prefix="${prefix}" --sysconfdir="${prefix}/etc" --libdir="${prefix}/lib" --localstatedir=/var "${configure_extra[@]}"
202 209 }
203 210
204 211 function prebuild() {
205 212 :
206 213 }
207 214
................................................................................
238 245
239 246 message="$1"
240 247
241 248 if [ -n "${message}" ]; then
242 249 echo "error: ${message}" >&2
243 250 fi
244 251
245 - cleanup
246 -
247 252 exit 1
248 253 }
249 254
250 255 scriptdir="$(cd "$(dirname "$(which "$0")")" && pwd)"
251 256 if [ -z "${scriptdir}" ]; then
252 257 echo "Unable to locate script directory" >&2
253 258