Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix Mac build

Browse source
This commit is contained in:
aydin.kim 2013-08-22 19:02:20 +09:00
parent 3adfb0e025
commit 05d5edafe0
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile.in
View file

@ -318,11 +318,11 @@ ifeq ($(CFG_OSTYPE),apple-darwin)
package: servo package: servo
mkdir -p Servo.app/Contents/MacOS/src/platform/macos/rust-cocoa mkdir -p Servo.app/Contents/MacOS/src/platform/macos/rust-cocoa
mkdir -p Servo.app/Contents/MacOS/src/platform/macos/rust-azure mkdir -p Servo.app/Contents/MacOS/src/support/azure/rust-azure
cp $(S)/Info.plist Servo.app/Contents/ cp $(S)Info.plist Servo.app/Contents/
cp servo Servo.app/Contents/MacOS/ cp servo Servo.app/Contents/MacOS/
cp src/platform/macos/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/platform/macos/rust-cocoa/ cp $(B)src/platform/macos/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/platform/macos/rust-cocoa/
cp src/platform/macos/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/platform/macos/rust-azure/ cp $(B)src/support/azure/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/support/azure/rust-azure/
else else

13
configure vendored
View file

@ -351,7 +351,7 @@ case ${TARGET_OSTYPE} in
probe CFG_CXX arm-linux-androideabi-g++ probe CFG_CXX arm-linux-androideabi-g++
probe CFG_LD arm-linux-androideabi-ld probe CFG_LD arm-linux-androideabi-ld
probe CFG_AR arm-linux-androideabi-ar probe CFG_AR arm-linux-androideabi-ar
probe CFG_RANLIB arm-linux-androideabi-ranlib probe CFG_RANLIB arm-linux-androideabi-ranlib
CFG_RUSTC_FLAGS="--target=${CFG_TARGET_TRIPLES} --android-cross-path=${CFG_ANDROID_CROSS_PATH}" CFG_RUSTC_FLAGS="--target=${CFG_TARGET_TRIPLES} --android-cross-path=${CFG_ANDROID_CROSS_PATH}"
;; ;;
*) *)
@ -622,12 +622,7 @@ export CFLAGS="${CFLAGS} -fPIC"
export LDFLAGS="${CFLAGS} -fPIC" export LDFLAGS="${CFLAGS} -fPIC"
# cross compile configurations # cross compile configurations
EXTRA_CONFIGURE_ARGS="CC=${CFG_CC} CXX=${CFG_CXX} LD=${CFG_LD} AR=${CFG_AR} RANLIB=${CFG_RANLIB}"
export CC="${CFG_CC}"
export CXX="${CFG_CXX}"
export LD="${CFG_LD}"
export AR="${CFG_AR}"
export RANLIB="${CFG_RANLIB}"
for i in ${CFG_SUBMODULES} for i in ${CFG_SUBMODULES}
do do
@ -658,16 +653,19 @@ do
CONFIGURE_ARGS="${CONFIGURE_ARGS} --android-ndk-path=${CFG_ANDROID_NDK_PATH}" CONFIGURE_ARGS="${CONFIGURE_ARGS} --android-ndk-path=${CFG_ANDROID_NDK_PATH}"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --android-api-version=14" CONFIGURE_ARGS="${CONFIGURE_ARGS} --android-api-version=14"
fi fi
CONFIGURE_ARGS="${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}"
;; ;;
platform/android/libexpat) platform/android/libexpat)
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/expat/configure" CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/expat/configure"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux-androideabi" CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux-androideabi"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-sysroot=${CFG_ANDROID_CROSS_PATH}/sysroot" CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-sysroot=${CFG_ANDROID_CROSS_PATH}/sysroot"
CONFIGURE_ARGS="${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}"
;; ;;
platform/android/libfreetype2) platform/android/libfreetype2)
CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux" CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-sysroot=${CFG_ANDROID_CROSS_PATH}/sysroot" CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-sysroot=${CFG_ANDROID_CROSS_PATH}/sysroot"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-zlib" CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-zlib"
CONFIGURE_ARGS="${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}"
;; ;;
platform/android/fontconfig) platform/android/fontconfig)
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/autogen.sh" CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/autogen.sh"
@ -679,6 +677,7 @@ do
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-cache-dir=${CFG_ANDROID_RESOURCE_PATH}/.fccache" CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-cache-dir=${CFG_ANDROID_RESOURCE_PATH}/.fccache"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-confdir=${CFG_ANDROID_RESOURCE_PATH}/.fcconfig" CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-confdir=${CFG_ANDROID_RESOURCE_PATH}/.fcconfig"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-default-fonts=${CFG_ANDROID_FONT_PATH}" CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-default-fonts=${CFG_ANDROID_FONT_PATH}"
CONFIGURE_ARGS="${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}"
;; ;;
support/spidermonkey/mozjs) support/spidermonkey/mozjs)
# needed because Spidermonkey configure is in non-standard location # needed because Spidermonkey configure is in non-standard location