diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2010-09-23 21:18:04 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2010-09-23 21:18:04 +0000 |
| commit | e84f210167f604a4c40e42774ebd1e80c1a23711 (patch) | |
| tree | 359344fd8664c0729d3ecef32a40b55be26184a2 /CMakeLists.txt | |
| parent | 79d806450f488fc1e368b90a1804417a10d5885c (diff) | |
| download | wireshark-e84f210167f604a4c40e42774ebd1e80c1a23711.tar.gz | |
Undo some part of
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34224
This fix is wrong. We need to find out why this fails and correct it in
svn path=/trunk/; revision=34226
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8b3ea9003..14216da406 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,14 +184,12 @@ else() add_definitions( -D_U_=\"\" ) endif() -if (NOT APPLE) - set(WIRESHARK_LD_FLAGS - -Wl,--as-needed - # -flto - # -fwhopr - # -fwhole-program - ) -endif() +set(WIRESHARK_LD_FLAGS + -Wl,--as-needed + # -flto + # -fwhopr + # -fwhole-program +) include(CheckCLinkerFlag) set(C 0) @@ -214,11 +212,6 @@ else() set(LINK_MODE_LIB SHARED) if(APPLE) set(LINK_MODE_MODULE SHARED) - else(APPLE) - set(LINK_MODE_MODULE MODULE) - endif(APPLE) - if(APPLE) - set(LINK_MODE_MODULE SHARED) else() set(LINK_MODE_MODULE MODULE) endif() |