|
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 |
@@ -953,24 +955,6 @@ OPAL_CHECK_BROKEN_QSORT |
953 | 955 | # all: type of getsockopt optlen |
954 | 956 | # all: type of recvfrom optlen |
955 | 957 |
|
956 | | -# |
957 | | -# Check out what thread support we have |
958 | | -# |
959 | | -OPAL_CONFIG_THREADS |
960 | | - |
961 | | -CFLAGS="$CFLAGS $THREAD_CFLAGS" |
962 | | -CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS" |
963 | | -CXXFLAGS="$CXXFLAGS $THREAD_CXXFLAGS" |
964 | | -CXXCPPFLAGS="$CXXCPPFLAGS $THREAD_CXXCPPFLAGS" |
965 | | -LDFLAGS="$LDFLAGS $THREAD_LDFLAGS" |
966 | | -LIBS="$LIBS $THREAD_LIBS" |
967 | | - |
968 | | -OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$THREAD_CFLAGS]) |
969 | | -OPAL_WRAPPER_FLAGS_ADD([CXXFLAGS], [$THREAD_CXXFLAGS]) |
970 | | -OPAL_WRAPPER_FLAGS_ADD([FCFLAGS], [$THREAD_FCFLAGS]) |
971 | | -OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$THREAD_LDFLAGS]) |
972 | | -# no need to update WRAPPER_EXTRA_LIBS - we'll get it from LT later |
973 | | - |
974 | 958 | # |
975 | 959 | # What is the local equivalent of "ln -s" |
976 | 960 | # |
@@ -1123,6 +1107,14 @@ AC_MSG_RESULT([$opal_subdir_args]) |
1123 | 1107 |
|
1124 | 1108 | OPAL_MCA |
1125 | 1109 |
|
| 1110 | +# |
| 1111 | +# Now that we know how to support threads with wrappers, update |
| 1112 | +# |
| 1113 | +OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$THREAD_CFLAGS]) |
| 1114 | +OPAL_WRAPPER_FLAGS_ADD([CXXFLAGS], [$THREAD_CXXFLAGS]) |
| 1115 | +OPAL_WRAPPER_FLAGS_ADD([FCFLAGS], [$THREAD_FCFLAGS]) |
| 1116 | +OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$THREAD_LDFLAGS]) |
| 1117 | + |
1126 | 1118 | m4_ifdef([project_ompi], [OMPI_REQUIRE_ENDPOINT_TAG_FINI]) |
1127 | 1119 |
|
1128 | 1120 | # Last minute disable of OpenSHMEM if we didn't find any oshmem SPMLs |
|
0 commit comments