Commit 8ac6025
committed
meson: Fix boost static linking logic
Do not attempt to statically link boost for -Ddefault_library=static:
-Dprefer_static=true exists now and should be used to statically link
external dependencies, while -Ddefault_library=static is meant for
internal dependencies.
However, if -Dprefer_static=true *is* passed (I'm not aware of any setup
where it is, but it doesn't hurt to be correct here), we need to work
around two meson bugs here.1 parent d1dce18 commit 8ac6025
1 file changed
+8
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| 109 | + | |
109 | 110 | | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
110 | 116 | | |
111 | 117 | | |
112 | 118 | | |
113 | 119 | | |
114 | | - | |
| 120 | + | |
115 | 121 | | |
116 | 122 | | |
117 | 123 | | |
118 | 124 | | |
119 | 125 | | |
120 | 126 | | |
121 | 127 | | |
122 | | - | |
| 128 | + | |
123 | 129 | | |
124 | 130 | | |
125 | 131 | | |
| |||
0 commit comments