mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 20:51:52 +01:00
The change in r90189 adds a link in a directory outside the iPhone platform
directory when building the llvmCore_Embedded project. Fix this by putting the iPhone platform directory into DEST_DIR instead of DEST_ROOT. I also noticed what appears to be an unintentional use of DEVELOPER_BIN instead of DEVELOPER_DIR, so I fixed that and changed to use DEVELOPER_DIR in some places that were hardcoded to "Developer". Finally, the other changes here allowed some refactoring and simplification, which I have done. llvm-svn: 93878
This commit is contained in:
parent
a3fff69e88
commit
c82f536a5c
@ -57,25 +57,20 @@ DARWIN_VERS=`uname -r | sed 's/\..*//'`
|
||||
echo DARWIN_VERS = $DARWIN_VERS
|
||||
|
||||
if [ "x$RC_ProjectName" = "xllvmCore_Embedded" ]; then
|
||||
DT_HOME=$DEST_DIR/Developer/Platforms/iPhoneOS.platform/Developer/usr
|
||||
DEST_ROOT="/Developer/Platforms/iPhoneOS.platform/Developer$DEST_ROOT"
|
||||
elif [ "x$RC_ProjectName" = "xllvmCore_EmbeddedHosted" ]; then
|
||||
DT_HOME=$DEST_DIR/usr
|
||||
DEST_ROOT="/Developer$DEST_ROOT"
|
||||
DEST_DIR="$DEST_DIR/Developer/Platforms/iPhoneOS.platform"
|
||||
mkdir -p "$DEST_DIR"
|
||||
fi
|
||||
|
||||
DEVELOPER_DIR="${DEVELOPER_DIR-Developer}"
|
||||
if [ "x$RC_ProjectName" = "xllvmCore_EmbeddedHosted" ]; then
|
||||
DT_HOME="$DEST_DIR/usr"
|
||||
HOST_SDKROOT=$SDKROOT
|
||||
else
|
||||
DT_HOME=$DEST_DIR/Developer/usr
|
||||
DEST_ROOT="/Developer$DEST_ROOT"
|
||||
fi
|
||||
if [ "x$DEVELOPER_BIN" != "x" ]; then
|
||||
if [ "x$RC_ProjectName" = "xllvmCore_Embedded" ]; then
|
||||
DT_HOME=$DEST_DIR/Developer/Platforms/iPhoneOS.platform/$DEVELOPER_DIR/usr
|
||||
else
|
||||
DT_HOME=$DEST_DIR/$DEVELOPER_DIR/usr
|
||||
fi
|
||||
DEST_ROOT="/$DEVELOPER_DIR$DEST_ROOT"
|
||||
DT_HOME="$DEST_DIR/$DEVELOPER_DIR/usr"
|
||||
fi
|
||||
|
||||
DEST_ROOT="/$DEVELOPER_DIR$DEST_ROOT"
|
||||
|
||||
################################################################################
|
||||
# Run the build.
|
||||
|
||||
@ -350,7 +345,7 @@ find $DEST_DIR -name html.tar.gz -exec rm {} \;
|
||||
cd $DEST_DIR
|
||||
mkdir -p ./usr/lib/
|
||||
cd usr/lib
|
||||
ln -s ../../Developer/usr/lib/libLTO.dylib ./libLTO.dylib
|
||||
ln -s ../../$DEVELOPER_DIR/usr/lib/libLTO.dylib ./libLTO.dylib
|
||||
|
||||
################################################################################
|
||||
# w00t! Done!
|
||||
|
Loading…
x
Reference in New Issue
Block a user