Merge.

10 files changed, 28 insertions, 19 deletions

diff --git a/samples/arm-unknown-linux-uclibc/crosstool.config b/samples/arm-unknown-linux-uclibc/crosstool.config
index 594c35e..ba5f810 100644
--- a/samples/arm-unknown-linux-uclibc/crosstool.config
+++ b/samples/arm-unknown-linux-uclibc/crosstool.config
@@ -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
 
 #
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
index b418916..6048cc0 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -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
 
 #
diff --git a/samples/armeb-unknown-linux-uclibc/crosstool.config b/samples/armeb-unknown-linux-uclibc/crosstool.config
index 40f3aea..72d7eaa 100644
--- a/samples/armeb-unknown-linux-uclibc/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibc/crosstool.config
@@ -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
 
 #
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
index 4124311..0b80064 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -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
 
 #
diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config
index cae6b64..847c644 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -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
 
 #
diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index 37a36c4..66b3fcc 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -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
 
 #
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index a5022fa..d5e65cc 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -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
 
 #
diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config
index b70cef4..5be266c 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -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
 
 #
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