From 9e06be3fcd28559d148b415b3f4ed500d2fff3b8 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Thu, 11 Jan 2018 23:46:22 +0900 Subject: Remove 64bit build designation on Solaris - Revert commit https://github.com/libressl-portable/portable/pull/327/commits/c18852f650a3cb258e10222695a31ed5c929ab23 - Remove -m64 from CMakeLists.txt by commit https://github.com/libressl-portable/portable/commit/08089a1b20a1818538670d641242266ed3185814 - Suggested by @andy-js in conversation https://github.com/libressl-portable/portable/pull/327 --- CMakeLists.txt | 2 +- m4/check-os-options.m4 | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef85176..3f7c6a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic -m64") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic") endif() add_definitions(-DLIBRESSL_INTERNAL) diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 4f56a8d..761a51d 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 @@ -112,7 +112,6 @@ char buf[1]; getentropy(buf, 1); *solaris*) HOST_OS=solaris HOST_ABI=elf - CFLAGS="$CFLAGS -m64" CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" AC_SUBST([PLATFORM_LDADD], ['-lnsl -lsocket']) ;; -- cgit v1.2.3-55-g6feb