Browse Source

Merging from 1.6 release branch.

Brad King 23 years ago
parent
commit
8ddf060b05
2 changed files with 4 additions and 5 deletions
  1. 1 1
      Utilities/Release/cmake_release.sh
  2. 3 4
      Utilities/Release/config_Linux

+ 1 - 1
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

+ 3 - 4
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}