From ce0e68b4cb2ed734c74fccf7c93f88bf3561ce32 Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Tue, 6 Jan 2004 21:51:03 +0000 Subject: [PATCH] removing reference to arm-linux-gcc in mozconfig and adding new mozconfig-arm for all the cross-compilation options git-svn-id: svn://10.0.0.236/trunk@150946 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/minimo/mozconfig | 11 +---------- mozilla/embedding/minimo/mozconfig-arm | 12 ++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 mozilla/embedding/minimo/mozconfig-arm diff --git a/mozilla/embedding/minimo/mozconfig b/mozilla/embedding/minimo/mozconfig index f560d1054ba..fe9218a0040 100644 --- a/mozilla/embedding/minimo/mozconfig +++ b/mozilla/embedding/minimo/mozconfig @@ -2,15 +2,6 @@ MINIMO=1 mk_add_options MINIMO=1 -# cross compile for arm-linux -#PATH=/opt/toolchain/bin:/opt/toolchain/arm-linux/local/bin:$PATH -#CROSS_COMPILE=1 -#LIBIDL_CONFIG=/opt/toolchain/arm-linux/local/bin/libIDL-config-2 -#HOST_LIBIDL_CONFIG=/usr/bin/libIDL-config -#ac_add_options --target=arm-linux -#ac_add_options --x-includes=/opt/toolchain/arm-linux/local/X11R6/include -#ac_add_options --x-libraries=/opt/toolchain/arm-linux/local/X11R6/lib - # use GTK+-2 widget set with XFT font rendering ac_add_options --enable-default-toolkit=gtk2 ac_add_options --enable-xft @@ -70,4 +61,4 @@ ac_add_options --enable-static # remove link dependency on libstdc++.so LIBS=-lsupc++ -CXX=arm-linux-gcc +CXX=gcc diff --git a/mozilla/embedding/minimo/mozconfig-arm b/mozilla/embedding/minimo/mozconfig-arm new file mode 100644 index 00000000000..0669bae230b --- /dev/null +++ b/mozilla/embedding/minimo/mozconfig-arm @@ -0,0 +1,12 @@ +# include base minimo build options +. $topsrcdir/embedding/minimo/mozconfig + +# cross compile for arm-linux +PATH=/opt/toolchain/bin:/opt/toolchain/arm-linux/local/bin:$PATH +CROSS_COMPILE=1 +LIBIDL_CONFIG=/opt/toolchain/arm-linux/local/bin/libIDL-config-2 +HOST_LIBIDL_CONFIG=/usr/bin/libIDL-config +ac_add_options --target=arm-linux +ac_add_options --x-includes=/opt/toolchain/arm-linux/local/X11R6/include +ac_add_options --x-libraries=/opt/toolchain/arm-linux/local/X11R6/lib +CXX=arm-linux-gcc