[Cmake-commits] CMake branch, next, updated. v3.2.1-1130-g4bf2084
Brad King
brad.king at kitware.com
Fri Mar 20 13:02:05 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 4bf20848b81d98a2d138862f47aba20a19c92652 (commit)
via 00842df48d8d3585562b8d64d56cd6646dc9d3ff (commit)
from 2c99728ad123267ffb654fd47636b6df600a7c89 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bf20848b81d98a2d138862f47aba20a19c92652
commit 4bf20848b81d98a2d138862f47aba20a19c92652
Merge: 2c99728 00842df
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 13:02:05 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 20 13:02:05 2015 -0400
Merge topic 'pgi-no-pie' into next
00842df4 PGI: Remove invalid -fPIE flag (#15460)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00842df48d8d3585562b8d64d56cd6646dc9d3ff
commit 00842df48d8d3585562b8d64d56cd6646dc9d3ff
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 12:59:54 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 20 12:59:54 2015 -0400
PGI: Remove invalid -fPIE flag (#15460)
The PGI compilers on Linux do not have the -fPIE flag. Remove the table
entry added by commit v2.8.9~125^2~2 (Add platform variables for
position independent code flags, 2012-05-05), which likely included it
only as part of a sweeping introduction of such flags.
diff --git a/Modules/Platform/Linux-PGI.cmake b/Modules/Platform/Linux-PGI.cmake
index 3cbb35c..baa2248 100644
--- a/Modules/Platform/Linux-PGI.cmake
+++ b/Modules/Platform/Linux-PGI.cmake
@@ -21,7 +21,7 @@ set(__LINUX_COMPILER_PGI 1)
macro(__linux_compiler_pgi lang)
# Shared library compile and link flags.
set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
- set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
+ set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "")
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
endmacro()
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Linux-PGI.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list