From 50892593668d4a8824489a8deda5f4770ab82b87 Mon Sep 17 00:00:00 2001 From: Stephane Peter Date: Sun, 22 Jul 2012 05:08:12 -0700 Subject: [PATCH] Use the CROSS_* variables to simplify the script a bit. --- build-libssl.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-libssl.sh b/build-libssl.sh index 10caf78..67f820d 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -70,19 +70,19 @@ do PLATFORM="iPhoneOS" fi - export CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer/" + export CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer" export CROSS_SDK="${PLATFORM}${SDKVERSION}.sdk" echo "Building openssl-${VERSION} for ${PLATFORM} ${SDKVERSION} ${ARCH}" echo "Please stand by..." - export CC="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer/usr/bin/gcc -arch ${ARCH}" + export CC="${CROSS_TOP}/usr/bin/gcc -arch ${ARCH}" mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/build-openssl-${VERSION}.log" ./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1 # add -isysroot to CC= - sed -ie "s!^CFLAG=!CFLAG=-isysroot ${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer/SDKs/${PLATFORM}${SDKVERSION}.sdk !" "Makefile" + sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} !" "Makefile" make >> "${LOG}" 2>&1 make install >> "${LOG}" 2>&1