Print this page
Linking fixes for Solarish systems
| Split |
Close |
| Expand all |
| Collapse all |
--- old/lib/Makefile
+++ new/lib/Makefile
1 1 #
2 2 # Copyright 2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3 3 #
4 4 # Licensed under the Apache License, Version 2.0 (the "License").
5 5 # You may not use this file except in compliance with the License.
6 6 # A copy of the License is located at
7 7 #
8 8 # http://aws.amazon.com/apache2.0
|
↓ open down ↓ |
8 lines elided |
↑ open up ↑ |
9 9 #
10 10 # or in the "license" file accompanying this file. This file is distributed
11 11 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12 12 # express or implied. See the License for the specific language governing
13 13 # permissions and limitations under the License.
14 14 #
15 15
16 16 ifeq ($(shell uname),Darwin)
17 17 LIBS = -lc -lpthread
18 18 else
19 - LIBS = -lc -lpthread -lrt
19 + LIBS = -lc -lpthread -lrt -lcrypto
20 20 endif
21 21
22 22 OBJS = $(wildcard ../utils/*.o ../stuffer/*.o ../tls/*.o ../iana/*.o ../crypto/*.o ../error/*.o ../libcrypto-root/lib/libcrypto.a)
23 23 all: libs2n.a libs2n.so libs2n.dylib
24 24
25 25 include ../s2n.mk
26 26
27 27 libs2n.a: ${OBJS}
28 28 ar cru libs2n.a ${OBJS}
29 29 ranlib libs2n.a
30 30
31 +#libs2n.so: ${OBJS}
32 +# ${CC} -shared ${LIBS} -o libs2n.so ${OBJS}
33 +
31 34 libs2n.so: ${OBJS}
32 - ${CC} -shared ${LIBS} -o libs2n.so ${OBJS}
35 + ld -shared ${LIBS} -o libs2n.so ${OBJS}
33 36
34 37 libs2n.dylib: ${OBJS}
35 38 test ! -f /usr/lib/libSystem.dylib || libtool -dynamic ${LIBS} -o libs2n.dylib ${OBJS}
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX