ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-04-16 07:26:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Yann E. MORIN" 2009-09-13 18:59:36 +02:00
commit 192d66e563
10 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/arm-unknown-linux-uclibc/crosstool.config
View File

@ -326,7 +326,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

2
samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
View File

@ -324,7 +324,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

2
samples/armeb-unknown-linux-uclibc/crosstool.config
View File

@ -325,7 +325,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

2
samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
View File

@ -324,7 +324,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

2
samples/i586-geode-linux-uclibc/crosstool.config
View File

@ -320,7 +320,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

2
samples/mips-unknown-linux-uclibc/crosstool.config
View File

@ -321,7 +321,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

2
samples/powerpc-unknown-linux-uclibc/crosstool.config
View File

@ -318,7 +318,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

2
samples/x86_64-unknown-linux-uclibc/crosstool.config
View File

@ -320,7 +320,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
CT_LIBC_UCLIBC_DEBUG_LEVEL=0
CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
# CT_LIBC_UCLIBC_LOCALES is not set
#

29
scripts/build/companion_libs/cloog.sh
View File

@ -34,22 +34,31 @@ do_cloog_extract() {
}
do_cloog() {
local _t
# Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
# while versions 0.15.4 onward do have the version in the dirname.
case "${CT_CLOOG_VERSION}" in
0.15.3) _t="";;
*) _t="-${CT_CLOOG_VERSION}";;
esac
mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
cd "${CT_BUILD_DIR}/build-cloog-ppl"
CT_DoStep INFO "Installing CLooG/ppl"
CT_DoLog EXTRA "Configuring CLooG/ppl"
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
"${CT_SRC_DIR}/cloog-ppl/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
--prefix="${CT_PREFIX_DIR}" \
--with-gmp="${CT_PREFIX_DIR}" \
--with-ppl="${CT_PREFIX_DIR}" \
--enable-shared \
--disable-static \
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
"${CT_SRC_DIR}/cloog-ppl${_t}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
--prefix="${CT_PREFIX_DIR}" \
--with-gmp="${CT_PREFIX_DIR}" \
--with-ppl="${CT_PREFIX_DIR}" \
--enable-shared \
--disable-static \
--with-bits=gmp
CT_DoLog EXTRA "Building CLooG/ppl"

2
scripts/saveSample.sh.in
View File

@ -99,7 +99,7 @@ fi
if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
# We save the file, and then point the saved sample to this file
CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
"${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
"${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
"${samp_dir}/crosstool.config"
else
# remove any dangling files