diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2018-01-11 23:46:22 +0900 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2018-01-11 23:46:22 +0900 |
commit | 9e06be3fcd28559d148b415b3f4ed500d2fff3b8 (patch) | |
tree | ea7c1eaa1e1f8d34f694be9f114809eae9020825 | |
parent | af624440e235ede8df0f194a3ccdfc317d42a7d4 (diff) | |
download | portable-9e06be3fcd28559d148b415b3f4ed500d2fff3b8.tar.gz portable-9e06be3fcd28559d148b415b3f4ed500d2fff3b8.tar.bz2 portable-9e06be3fcd28559d148b415b3f4ed500d2fff3b8.zip |
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
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | m4/check-os-options.m4 | 1 |
2 files changed, 1 insertions, 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") | |||
79 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__") | 79 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__") |
80 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600") | 80 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600") |
81 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP") | 81 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP") |
82 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic -m64") | 82 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic") |
83 | endif() | 83 | endif() |
84 | 84 | ||
85 | add_definitions(-DLIBRESSL_INTERNAL) | 85 | 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); | |||
112 | *solaris*) | 112 | *solaris*) |
113 | HOST_OS=solaris | 113 | HOST_OS=solaris |
114 | HOST_ABI=elf | 114 | HOST_ABI=elf |
115 | CFLAGS="$CFLAGS -m64" | ||
116 | CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" | 115 | CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" |
117 | AC_SUBST([PLATFORM_LDADD], ['-lnsl -lsocket']) | 116 | AC_SUBST([PLATFORM_LDADD], ['-lnsl -lsocket']) |
118 | ;; | 117 | ;; |