diff -ur boost_1_53_0/tools/build/v2/tools/cray.jam boost_1_53_0.2/tools/build/v2/tools/cray.jam
old
|
new
|
|
39 | 39 | } |
40 | 40 | # If we can't find 'CC' anyway, at least show 'CC' in the commands |
41 | 41 | command ?= CC ; |
| 42 | |
| 43 | # set link flags |
| 44 | flags cray.link FINDLIBS-ST : [ |
| 45 | feature.get-values <find-static-library> : $(options) ] : unchecked ; |
| 46 | |
| 47 | flags cray.link FINDLIBS-SA : [ |
| 48 | feature.get-values <find-shared-library> : $(options) ] : unchecked ; |
42 | 49 | |
43 | 50 | common.handle-options cray : $(condition) : $(command) : $(options) ; |
44 | 51 | } |
… |
… |
|
58 | 65 | flags cray.compile OPTIONS <optimization>space : -O1 ; |
59 | 66 | |
60 | 67 | flags cray.compile OPTIONS <cflags> ; |
| 68 | flags cray.compile OPTIONS <link>shared : -fPIC ; |
61 | 69 | flags cray.compile.c++ OPTIONS <cxxflags> ; |
62 | 70 | flags cray.compile DEFINES <define> ; |
63 | 71 | flags cray.compile INCLUDES <include> ; |
64 | 72 | flags cray.link OPTIONS <linkflags> ; |
| 73 | flags cray.link OPTIONS <link>shared : -fPIC ; |
65 | 74 | |
66 | | flags cray.link LIBPATH <library-path> ; |
| 75 | flags cray.link LINKPATH <library-path> ; |
67 | 76 | flags cray.link LIBRARIES <library-file> ; |
68 | 77 | flags cray.link FINDLIBS-ST <find-static-library> ; |
69 | 78 | flags cray.link FINDLIBS-SA <find-shared-library> ; |
| 79 | flags cray.link LINK-RUNTIME <runtime-link>static : static ; |
| 80 | flags cray.link LINK-RUNTIME <runtime-link>shared : dynamic ; |
| 81 | flags cray.link RPATH <dll-path> ; |
70 | 82 | |
71 | 83 | actions link bind LIBRARIES |
72 | 84 | { |
73 | | $(CONFIG_COMMAND) $(OPTIONS) -o "$(<)" -L$(LIBPATH) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) |
| 85 | $(CONFIG_COMMAND) $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) |
74 | 86 | } |
75 | 87 | |
76 | 88 | # When creating dynamic libraries, we don't want to be warned about unresolved |
… |
… |
|
80 | 92 | |
81 | 93 | actions link.dll bind LIBRARIES |
82 | 94 | { |
83 | | $(CONFIG_COMMAND) -shared $(OPTIONS) -o "$(<[1])" -L$(LIBPATH) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) |
| 95 | $(CONFIG_COMMAND) -shared $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<[1])" "$(>)" -Wl,-h -Wl,$(<[1]:D=) "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) |
84 | 96 | } |
85 | 97 | |
86 | 98 | |