Changeset 125121 in webkit


Ignore:
Timestamp:
Aug 8, 2012 5:18:01 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] Fix "-fPIC" define in the BlackBerry build
https://bugs.webkit.org/show_bug.cgi?id=93548

Patch by Ming Xie <mxie@rim.com> on 2012-08-08
Reviewed by Rob Buis.

In the current CMake release (version 2.8.5), ${CMAKE_SHARED
_LIBRARY_C_FLAGS} and ${CMAKE_SHARED_LIBRARY_CXX_FLAGS} is
set to empty (See cmake/Modules/Platform/QNX.cmake)

This breaks the assumption which WebKit CMake build system
makes in Source/cmake/WebKitHelper.cmake

  • Source/cmake/OptionsBlackBerry.cmake:
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r125041 r125121  
     12012-08-08  Ming Xie  <mxie@rim.com>
     2
     3        [BlackBerry] Fix "-fPIC" define in the BlackBerry build
     4        https://bugs.webkit.org/show_bug.cgi?id=93548
     5
     6        Reviewed by Rob Buis.
     7
     8        In the current CMake release (version 2.8.5), ${CMAKE_SHARED
     9        _LIBRARY_C_FLAGS} and ${CMAKE_SHARED_LIBRARY_CXX_FLAGS} is
     10        set to empty (See cmake/Modules/Platform/QNX.cmake)
     11
     12        This breaks the assumption which WebKit CMake build system
     13        makes in Source/cmake/WebKitHelper.cmake
     14
     15        * Source/cmake/OptionsBlackBerry.cmake:
     16
    1172012-08-08  Philippe Normand  <pnormand@igalia.com>
    218
  • trunk/Source/cmake/OptionsBlackBerry.cmake

    r124242 r125121  
    9797FIND_STAGING_LIBRARY(OTS_LIBRARY ots)
    9898
     99# Add "-fPIC" to CMAKE_SHARED_LIBRARY_C_FLAGS and CMAKE_SHARED_LIBRARY_CXX_FLAGS
     100# This is because "-fPIC" is not included in the default defines under Modules/Platform/QNX.cmake
     101SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
     102SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
     103
    99104# Show unresolved symbols when doing the final shared object link
    100105IF (PROFILING)
Note: See TracChangeset for help on using the changeset viewer.