diff options
| author | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-31 23:14:31 +0300 |
|---|---|---|
| committer | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-31 23:14:31 +0300 |
| commit | 7b0c850dcd29cd880dc71490fe9b0b5490c0c036 (patch) | |
| tree | 0238bf289177ddf0b4afedf862ecafe537f28a11 | |
| parent | a93c5c542042b582f2da765aa386772dc8437f01 (diff) | |
| parent | ed3dc690e04382dce36305091ad2e14038147ab4 (diff) | |
| download | pcsxr-7b0c850dcd29cd880dc71490fe9b0b5490c0c036.tar.gz | |
Merge branch 'fix-linux-build' into sync-with-codeplex
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -8,6 +8,6 @@ xcuserdata macosx/Info.plistvers.plist *.kdev4 linux_build.sh +project.xcworkspace .DS_Store -*.o build/ diff --git a/configure.ac b/configure.ac index 542b500f..4852d8c6 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,13 @@ AM_PROG_AS LT_PREREQ([2.2.6]) LT_INIT([disable-static]) +AX_APPEND_LINK_FLAGS([-fno-pie]) +AX_COMPILER_VENDOR +if test "$ax_cv_c_compiler_vendor" = "gnu"; then + AX_CHECK_LINK_FLAG([-no-pie],[AX_APPEND_LINK_FLAGS([-no-pie])],) + AX_CHECK_LINK_FLAG([-nopie],[AX_APPEND_LINK_FLAGS([-nopie])],) +fi + AM_GLIB_GNU_GETTEXT IT_PROG_INTLTOOL([0.35.0]) |