summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2003-03-13 20:59:53 (GMT)
committerBrad King <brad.king@kitware.com>2003-03-13 20:59:53 (GMT)
commit8ddf060b05a4a157a635e2616ce72aef70adfd70 (patch)
treec1cccdedca4c55b4591c00085ecc8997523dff16 /Utilities
parentd055d402f75ac5589eb24378bc7f228acdba7e1d (diff)
downloadCMake-8ddf060b05a4a157a635e2616ce72aef70adfd70.zip
CMake-8ddf060b05a4a157a635e2616ce72aef70adfd70.tar.gz
CMake-8ddf060b05a4a157a635e2616ce72aef70adfd70.tar.bz2
Merging from 1.6 release branch.
Diffstat (limited to 'Utilities')
-rwxr-xr-xUtilities/Release/cmake_release.sh2
-rw-r--r--Utilities/Release/config_Linux7
2 files changed, 4 insertions, 5 deletions
diff --git a/Utilities/Release/cmake_release.sh b/Utilities/Release/cmake_release.sh
index 288d7e6..1766bee 100755
--- a/Utilities/Release/cmake_release.sh
+++ b/Utilities/Release/cmake_release.sh
@@ -275,7 +275,7 @@ utilities()
rm -rf CheckoutTemp &&
mkdir CheckoutTemp &&
cd CheckoutTemp &&
- cvs -q -z3 -d $CVSROOT co CMake/Utilities/Release &&
+ cvs -q -z3 -d $CVSROOT co -r ${TAG} CMake/Utilities/Release &&
mv CMake/Utilities/Release ../ReleaseUtilities &&
cd .. &&
rm -rf CheckoutTemp
diff --git a/Utilities/Release/config_Linux b/Utilities/Release/config_Linux
index 849b1ab..b103f53 100644
--- a/Utilities/Release/config_Linux
+++ b/Utilities/Release/config_Linux
@@ -1,15 +1,14 @@
-PLATFORM="x86-linux-static"
+PLATFORM="x86-linux"
CURSES_LIBRARY="/usr/lib/libcurses.a"
FORM_LIBRARY="/usr/lib/libform.a"
-CC="gcc"
-CXX="c++"
+CC="gcc304s"
+CXX="c++304s"
# Write entries into the cache file before building cmake.
write_cache()
{
cat > CMakeCache.txt <<EOF
BUILD_TESTING:BOOL=ON
-CMAKE_EXE_LINKER_FLAGS:STRING=-static
CMAKE_SKIP_RPATH:BOOL=1
CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
CURSES_LIBRARY:FILEPATH=${CURSES_LIBRARY}