@@ -127,6 +127,12 @@ getLibuast := {
127
127
" rm src/main/resources/libuast/libuast.so" #&& // always a static build
128
128
" rm libuast-bin.tar.gz" !
129
129
130
+ " find src/main/resources" !
131
+
132
+ " nm src/main/resources/libuast/libuast.a" #| " grep -c UastDecode" !
133
+
134
+ " nm src/main/resources/libuast/libuast.a" #| " wc -l" !
135
+
130
136
println(" Done unpacking libuast" )
131
137
}
132
138
@@ -154,16 +160,15 @@ def compileUnix(sourceFiles: String) = {
154
160
}
155
161
156
162
val osName = System .getProperty(" os.name" ).toLowerCase()
157
- if (osName.contains(" mac os x" )) { // TODO(bzz): change to '-fPIC -O2' for release
163
+ if (osName.contains(" mac os x" )) { // TODO(bzz): change back to '-fPIC -O2' for release
158
164
val cmd : String = " g++ -shared -Wall -g -std=c++11 " +
159
165
" -I/usr/include " +
160
166
" -I" + javaHome + " /include/ " +
161
167
" -I" + javaHome + " /include/darwin " +
162
168
" -Isrc/main/resources/libuast " +
163
- " -Lsrc/main/resources/libuast " + // sic, must be in the classpath for the test
164
- " -l uast " +
165
- " -o src/main/resources/lib/libscalauast.dylib " +
166
- sourceFiles + " "
169
+ " -o src/main/resources/lib/libscalauast.dylib " + // sic, must be in the classpath for the test
170
+ sourceFiles +
171
+ " src/main/resources/libuast/libuast.a "
167
172
168
173
checkedProcess(cmd, " macOS build" )
169
174
} else {
@@ -172,12 +177,13 @@ def compileUnix(sourceFiles: String) = {
172
177
" -I" + javaHome + " /include/ " +
173
178
" -I" + javaHome + " /include/linux " +
174
179
" -Isrc/main/resources/libuast " +
175
- " -Lsrc/main/resources/libuast " +
176
- " -l uast " +
177
180
" -o src/main/resources/lib/libscalauast.so " +
178
- sourceFiles + " "
181
+ sourceFiles +
182
+ " src/main/resources/libuast/libuast.a "
179
183
180
184
checkedProcess(cmd, " Linux build" )
185
+
186
+ " nm src/main/resources/lib/libscalauast.so" #| " grep -c UastDecode" !
181
187
}
182
188
}
183
189
@@ -199,10 +205,9 @@ def crossCompileMacOS(sourceFiles: String): Unit = {
199
205
" -I/usr/lib/jvm/java-8-openjdk-amd64/include " +
200
206
" -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux " +
201
207
" -Isrc/libuast-native/ " +
202
- " -Lsrc/main/resources/libuast " +
203
- " -l uast " +
204
208
" -o src/main/resources/lib/libscalauast.dylib " +
205
- sourceFiles
209
+ sourceFiles +
210
+ " src/main/resources/libuast/libuast.a "
206
211
207
212
checkedProcess(cmd, " macOS cross-compile build" )
208
213
}
0 commit comments