diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-08-09 02:26:30 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-08-09 02:26:30 +0000 |
| commit | 754ff598d5c21605ed4dbf02ec938acb168f5dba (patch) | |
| tree | acaa5771a0978afdc7028a899177b9d4b52c5d0b | |
| parent | ca91758fdec79211bd7d90bf580b1022d57a1db5 (diff) | |
| download | tigervnc-754ff598d5c21605ed4dbf02ec938acb168f5dba.tar.gz tigervnc-754ff598d5c21605ed4dbf02ec938acb168f5dba.zip | |
(Re-)fix static Xvnc build. We can leverage the BUILD_STATIC option to modify our fake libtool scripts such that they pick up the static libstdc++.a. Unfortunately, adding -static-libgcc to those scripts makes libtool barf, so we still have to add that flag to LDFLAGS in build-xorg.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4614 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | cmake/Modules/CMakeMacroLibtoolFile.cmake | 4 | ||||
| -rwxr-xr-x | unix/build-xorg | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake index df9d49f8..0cf7b9fb 100644 --- a/cmake/Modules/CMakeMacroLibtoolFile.cmake +++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake @@ -77,6 +77,10 @@ macro(libtool_create_control_file _target) get_filename_component(_lname ${_target_location} NAME_WE) set(_laname ${CMAKE_CURRENT_BINARY_DIR}/${_lname}.la) + if(BUILD_STATIC) + set(_target_dependency_libs "${_target_dependency_libs} -L${CMAKE_BINARY_DIR}/staticlib") + endif() + file(WRITE ${_laname} "# ${_lname}.la - a libtool library file\n# Generated by ltmain.sh (GNU libtool) 2.2.6b\n") file(APPEND ${_laname} "dlname=''\n\n") file(APPEND ${_laname} "library_names=''\n\n") diff --git a/unix/build-xorg b/unix/build-xorg index e71f6dd4..f7abcc24 100755 --- a/unix/build-xorg +++ b/unix/build-xorg @@ -293,7 +293,7 @@ if [ "$MODE" = "build" ]; then fi CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" - LDFLAGS="$LDFLAGS -L`pwd`/xorg.build/syslib" + LDFLAGS="$LDFLAGS -static-libgcc -L`pwd`/xorg.build/syslib" echo CC = $CC echo CXX = $CXX echo CFLAGS = $CFLAGS |