Skip to content

Commit 2a14230

Browse files
committed
BF: CS-1267 broken build on Solaris 11 after update
1 parent 89ba1e0 commit 2a14230

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

cmake/ArchitectureSpecificSettings.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#___INFO__MARK_BEGIN_NEW__
22
###########################################################################
3-
#
3+
#
44
# Copyright 2023-2024 HPC-Gridware GmbH
5-
#
5+
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
17-
#
17+
#
1818
###########################################################################
1919
#___INFO__MARK_END_NEW__
2020

@@ -215,6 +215,7 @@ function(architecture_specific_settings)
215215
message(STATUS "We are on Solaris: ${SGE_ARCH}")
216216
# @todo CS-983 Processor set binding on Solaris is broken
217217
# add_compile_definitions(SOLARIS BINDING_SOLARIS GETHOSTBYNAME_R5 GETHOSTBYADDR_R7 SPOOLING_dynamic __SGE_COMPILE_WITH_GETTEXT__)
218+
add_compile_definitions(__EXTENSIONS__)
218219
add_compile_definitions(SOLARIS GETHOSTBYNAME_R5 GETHOSTBYADDR_R7 SPOOLING_dynamic __SGE_COMPILE_WITH_GETTEXT__)
219220
add_compile_options(-fPIC)
220221
set(WITH_JEMALLOC OFF PARENT_SCOPE)
@@ -224,7 +225,6 @@ function(architecture_specific_settings)
224225

225226
set(JNI_ARCH "solaris" PARENT_SCOPE)
226227
if (SGE_ARCH STREQUAL "osol-amd64")
227-
add_compile_definitions(__EXTENSIONS__)
228228
set(NSL_LIB socket nsl PARENT_SCOPE)
229229
endif()
230230
elseif (SGE_ARCH MATCHES "darwin-arm64")

0 commit comments

Comments
 (0)