From 883f2d69ef603fa3b33cd93dde29d5b4d6ca9231 Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Thu, 28 Jul 2011 09:58:24 +0000
Subject: Add a BUILD_STATIC option which links statically against libgcc and
 libstdc++ (if applicable.)  Remove the corresponding code from build-xorg.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4608 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 unix/build-xorg | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'unix/build-xorg')

diff --git a/unix/build-xorg b/unix/build-xorg
index ffa04e27..e71f6dd4 100755
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -116,7 +116,7 @@ build ()
 
     # Build VNC
     echo "*** Building VNC ***"
-    cmake -G"Unix Makefiles" ${1+"$@"} -DUSE_INCLUDED_ZLIB=1 $SRCDIR
+    cmake -G"Unix Makefiles" ${1+"$@"} -DUSE_INCLUDED_ZLIB=1 -DUSE_INCLUDED_FLTK=1 -DBUILD_STATIC=1 $SRCDIR
     $MAKE
 
     # Build Xorg
@@ -291,9 +291,9 @@ if [ "$MODE" = "build" ]; then
     if [ "$CXXFLAGS" = "" ]; then
 	CXXFLAGS=-O3
     fi
-    CFLAGS="$CFLAGS -static-libgcc -fPIC"
-    CXXFLAGS="$CXXFLAGS -static-libgcc -fPIC"
-    LDFLAGS="$LDFLAGS -static-libgcc -L`pwd`/xorg.build/syslib"
+    CFLAGS="$CFLAGS -fPIC"
+    CXXFLAGS="$CXXFLAGS -fPIC"
+    LDFLAGS="$LDFLAGS -L`pwd`/xorg.build/syslib"
     echo CC = $CC
     echo CXX = $CXX
     echo CFLAGS = $CFLAGS
@@ -302,16 +302,6 @@ if [ "$MODE" = "build" ]; then
     if [[ $CFLAGS = *-m32* ]]; then
 	CFGHOST="--host i686-pc-linux-gnu"
     fi
-    if [ -f ./xorg.build/syslib/libstdc++.a ]; then
-	rm -f ./xorg.build/syslib/libstdc++.a
-    fi
-    LIBSTDCPLUSPLUS=`$CC $CFLAGS -print-file-name=libstdc++.a`
-    if [ ! -f $LIBSTDCPLUSPLUS ]; then
-	echo Cannot find suitable libstdc++.a.  Aborting ...
-	exit 1
-    else
-	ln -fs $LIBSTDCPLUSPLUS ./xorg.build/syslib
-    fi
     STATICLIBS='libcrypto.a libz.a'
     for lib in $STATICLIBS; do
 	if [ -f ./xorg.build/syslib/$lib ]; then
-- 
cgit v1.2.3