|
26 | 26 | # Copyright (c) 2018 Amazon.com, Inc. or its affiliates. |
27 | 27 | # All Rights reserved. |
28 | 28 | # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. |
| 29 | +# Copyright (c) 2019 Triad National Security, LLC. All rights |
| 30 | +# reserved. |
29 | 31 | # $COPYRIGHT$ |
30 | 32 | # |
31 | 33 | # Additional copyrights may follow |
@@ -949,24 +951,6 @@ OPAL_CHECK_BROKEN_QSORT |
949 | 951 | # all: type of getsockopt optlen |
950 | 952 | # all: type of recvfrom optlen |
951 | 953 |
|
952 | | -# |
953 | | -# Check out what thread support we have |
954 | | -# |
955 | | -OPAL_CONFIG_THREADS |
956 | | - |
957 | | -CFLAGS="$CFLAGS $THREAD_CFLAGS" |
958 | | -CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS" |
959 | | -CXXFLAGS="$CXXFLAGS $THREAD_CXXFLAGS" |
960 | | -CXXCPPFLAGS="$CXXCPPFLAGS $THREAD_CXXCPPFLAGS" |
961 | | -LDFLAGS="$LDFLAGS $THREAD_LDFLAGS" |
962 | | -LIBS="$LIBS $THREAD_LIBS" |
963 | | - |
964 | | -OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$THREAD_CFLAGS]) |
965 | | -OPAL_WRAPPER_FLAGS_ADD([CXXFLAGS], [$THREAD_CXXFLAGS]) |
966 | | -OPAL_WRAPPER_FLAGS_ADD([FCFLAGS], [$THREAD_FCFLAGS]) |
967 | | -OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$THREAD_LDFLAGS]) |
968 | | -# no need to update WRAPPER_EXTRA_LIBS - we'll get it from LT later |
969 | | - |
970 | 954 | # |
971 | 955 | # What is the local equivalent of "ln -s" |
972 | 956 | # |
@@ -1119,6 +1103,14 @@ AC_MSG_RESULT([$opal_subdir_args]) |
1119 | 1103 |
|
1120 | 1104 | OPAL_MCA |
1121 | 1105 |
|
| 1106 | +# |
| 1107 | +# Now that we know how to support threads with wrappers, update |
| 1108 | +# |
| 1109 | +OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$THREAD_CFLAGS]) |
| 1110 | +OPAL_WRAPPER_FLAGS_ADD([CXXFLAGS], [$THREAD_CXXFLAGS]) |
| 1111 | +OPAL_WRAPPER_FLAGS_ADD([FCFLAGS], [$THREAD_FCFLAGS]) |
| 1112 | +OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$THREAD_LDFLAGS]) |
| 1113 | + |
1122 | 1114 | m4_ifdef([project_ompi], [OMPI_REQUIRE_ENDPOINT_TAG_FINI]) |
1123 | 1115 |
|
1124 | 1116 | # Last minute disable of OpenSHMEM if we didn't find any oshmem SPMLs |
|
0 commit comments