diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-09-13 16:59:36 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-09-13 16:59:36 (GMT) |
| commit | 192d66e56320510596f9409d195ae821b5b61907 (patch) | |
| tree | 13eb9b69bf1f0d26aaa579ee84868d11b1e7c6c8 /scripts | |
| parent | b6568d675b4da948cc9b965d88203f8f52bd05c9 (diff) | |
| parent | 2d6a221babda79345734688ffd9f36261121cae0 (diff) | |
Merge.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_libs/cloog.sh | 29 | ||||
| -rw-r--r-- | scripts/saveSample.sh.in | 2 |
2 files changed, 20 insertions, 11 deletions
diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index fae3f72..f6eb68a 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -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" diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 9e4e358..e91dc9e 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -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 |