Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

322578 Support ppc<->x86 cross builds for Mac OS X. Core cross-compile support. r=bsmedberg r=cls sr=bryner

Browse Source
This commit is contained in:
mark%moxienet.com 2006-02-21 00:21:55 +00:00
parent a3397e9b48
commit 0fcfd6405d
4 changed files with 112 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.mk
View File

@ -677,6 +677,9 @@ else # NEXT_ROOT
PBBUILD = $(PBBUILD_BIN)
endif # NEXT_ROOT
PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)" SYMROOT=build
ifdef CROSS_COMPILE
PBBUILD_SETTINGS += ARCHS="$(OS_TEST)"
endif # CROSS_COMPILE
ifdef MACOS_SDK_DIR
PBBUILD_SETTINGS += SDKROOT="$(MACOS_SDK_DIR)"
endif # MACOS_SDK_DIR

66
configure.in
View File

@ -272,12 +272,37 @@ if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
case "$build:$target" in
powerpc-apple-darwin8*:i?86-apple-darwin*)
dnl The Darwin cross compiler doesn't necessarily point itself at a
dnl root that has libraries for the proper architecture, it defaults
dnl to the system root. The libraries in the system root on current
dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
dnl checks will fail. Fake a working SDK in that case.
_SAVE_CFLAGS=$CFLAGS
_SAVE_CXXFLAGS=$CXXLAGS
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
;;
esac
AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
unset ac_cv_prog_CXX
AC_PROG_CXX
case "$build:$target" in
powerpc-apple-darwin8*:i?86-apple-darwin*)
dnl Revert the changes made above. From this point on, the target
dnl compiler will never be used without applying the SDK to CFLAGS
dnl (see --with-macos-sdk below).
CFLAGS=$_SAVE_CFLAGS
CXXFLAGS=$_SAVE_CXXFLAGS
;;
esac
AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
AC_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
@ -665,6 +690,13 @@ tools are selected during the Xcode/Developer Tools installation.])
dnl set because both the compiler and linker use it.
LIBS="-L${MACOS_SDK_DIR}/usr/lib/gcc/darwin -L${MACOS_SDK_DIR}/usr/lib/gcc/darwin/${GCC_VERSION_FULL} -L${MACOS_SDK_DIR}/usr/lib $LIBS"
export NEXT_ROOT=$MACOS_SDK_DIR
if test -n "$CROSS_COMPILE" ; then
dnl NEXT_ROOT will be in the environment, but it shouldn't be set for
dnl the build host. HOST_CXX is presently unused.
HOST_CC="NEXT_ROOT= $HOST_CC"
HOST_CXX="NEXT_ROOT= $HOST_CXX"
fi
else
dnl gcc >= 4.0 uses different paths than above, but knows how to find
dnl them itself.
@ -687,11 +719,10 @@ tools are selected during the Xcode/Developer Tools installation.])
AC_MSG_CHECKING([for valid compiler/Mac OS X SDK combination])
AC_LANG_CPLUSPLUS
AC_TRY_RUN([#include <new>
int main() { return 0; }],
AC_TRY_COMPILE([#include <new>
int main() { return 0; }],
result=yes,
result=no,
result=maybe)
result=no)
AC_LANG_RESTORE
AC_MSG_RESULT($result)
@ -813,6 +844,7 @@ if test -n "$CROSS_COMPILE"; then
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
mingw*) OS_ARCH=WINNT ;;
wince*) OS_ARCH=WINCE ;;
darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
esac
else
OS_TARGET=`uname -s`
@ -1042,7 +1074,19 @@ WINCE)
OS_TARGET=WINCE
;;
Darwin)
OS_TEST=`uname -p`
case "${target_cpu}" in
powerpc*)
OS_TEST=ppc
;;
i*86*)
OS_TEST=i386
;;
*)
if test -z "$CROSS_COMPILE" ; then
OS_TEST=`uname -p`
fi
;;
esac
;;
esac
@ -1390,6 +1434,7 @@ case "$target" in
STRIP="$STRIP -x -S"
_PLATFORM_DEFAULT_TOOLKIT='mac'
MOZ_ENABLE_POSTSCRIPT=
TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
# set MACOSX to generate lib/mac/MoreFiles/Makefile
MACOSX=1
@ -1405,15 +1450,6 @@ case "$target" in
AC_MSG_RESULT([no])
fi
LDFLAGS=$_SAVE_LDFLAGS
case "${target_cpu}" in
powerpc*)
DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
;;
i*86*)
DSO_LDOPTS="$DSO_LDOPTS -arch i386"
;;
esac
;;
*-freebsd*)
@ -6578,7 +6614,7 @@ if test -n "$CROSS_COMPILE"; then
if test -z "$HOST_LIBIDL_CONFIG"; then
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
if test -n "$HOST_LIBIDL_CONFIG"; then
if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
else

6
security/manager/Makefile.in
View File

@ -203,8 +203,12 @@ DEFAULT_GMAKE_FLAGS += \
RANLIB="$(RANLIB)" \
RC="$(RC) $(RCFLAGS)" \
OS_ARCH="$(OS_ARCH)" \
CPU_ARCH="$(TARGET_CPU)" \
$(NULL)
ifeq ($(OS_ARCH),Darwin)
DEFAULT_GMAKE_FLAGS += CPU_ARCH="$(OS_TEST)"
else
DEFAULT_GMAKE_FLAGS += CPU_ARCH="$(TARGET_CPU)"
endif
SKIP_CHK=1
endif
SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile

62
xpcom/typelib/xpidl/Makefile.in
View File

@ -74,6 +74,59 @@ ifdef STATIC_LIBIDL
USE_STATIC_LIBS = 1
endif
ifeq ($(OS_ARCH),Darwin)
# The only reason to not always strip the SDK out is that the libraries
# in / on ppc currently aren't fat, preventing the target xpidl from linking
# on a ppc->x86 build. The SDK, presumably 10.4u, must be included in that
# case in order to successfully link. Because the target xpidl isn't
# currently built in a cross compile, though, this point is moot for the
# time being.
ifndef CROSS_COMPILE
# When doing a native build, don't build xpidl against the SDK. libIDL
# was most likely configured for the system headers, and bringing in the
# SDK's headers instead will cause problems.
_STRIP_SDK = 1
else
# Cross-compiling
# Don't build xpidl for the target. This is not intended to be a permanent
# solution. It's necessary because it is presently difficult to build
# xpidl's prerequisites (libIDL and glib) as fat and suitable for a cross.
# This will be fixed. -mm
PROGRAM=
# Since only host_xpidl will be built for now, always strip out the SDK
# (as above).
_STRIP_SDK=1
# When fat xpidl prerequisites are available, the PROGRAM= and _STRIP_SDK=1
# above are expected to disappear, and be replaced with the following
# conditonal.
# ifeq (86_powerpc,$(findstring 86,$(host_cpu))_$(TARGET_CPU))
# # When cross-compiling from x86 to ppc, an old (10.2-ish) SDK might be in
# # use, and libIDL will have been configured for new (10.4-ish) headers.
# _STRIP_SDK = 1
# endif
endif # CROSS_COMPILE
ifneq (,$(_STRIP_SDK)$(MACOS_SDK_DIR))
# libIDL is configured for the system's headers, with no SDK involved.
# There may be header conflicts if the SDK used for the Mozilla build
# is used here. There are very few specific cases where the SDK needs to
# remain set to build xpidl.
NEXT_ROOT=
OS_CFLAGS := $(shell echo $(OS_CFLAGS)|sed -E -e "s%((-I|-isystem )$(MACOS_SDK_DIR)/usr/(include|lib/gcc)[^ ]*)|-F$(MACOS_SDK_DIR)(/System)?/Library/Frameworks[^ ]*|-nostdinc[^ ]*|-isysroot $(MACOS_SDK_DIR)%%g")
OS_CFLAGS := $(patsubst -I$(MACOS_SDK_DIR)%,-I%,$(OS_CFLAGS))
OS_LIBS := $(patsubst -L$(MACOS_SDK_DIR)/usr/lib%,,$(OS_LIBS))
LDFLAGS := $(shell echo $(LDFLAGS)|sed -E -e "s%-Wl,-syslibroot,$(MACOS_SDK_DIR)%%g")
endif # _STRIP_SDK
endif # Darwin
include $(topsrcdir)/config/rules.mk
CFLAGS += $(LIBIDL_CFLAGS)
@ -122,14 +175,5 @@ endif
endif
ifdef MACOS_SDK_DIR
# xpidl is for the build host, pull out the cross-compilation stuff
NEXT_ROOT=
OS_CFLAGS := $(shell echo $(OS_CFLAGS)|sed -E -e "s%((-I|-isystem )$(MACOS_SDK_DIR)/usr/(include|lib/gcc)[^ ]*)|-F$(MACOS_SDK_DIR)(/System)?/Library/Frameworks[^ ]*|-nostdinc[^ ]*|-isysroot $(MACOS_SDK_DIR)%%g")
OS_CFLAGS := $(patsubst -I$(MACOS_SDK_DIR)%,-I%,$(OS_CFLAGS))
OS_LIBS := $(patsubst -L$(MACOS_SDK_DIR)/usr/lib%,,$(OS_LIBS))
LDFLAGS := $(shell echo $(LDFLAGS)|sed -E -e "s%-Wl,-syslibroot,$(MACOS_SDK_DIR)%%g")
endif
export::
@$(MAKE) libs