File tree Expand file tree Collapse file tree 4 files changed +22
-15
lines changed Expand file tree Collapse file tree 4 files changed +22
-15
lines changed Original file line number Diff line number Diff line change @@ -25,19 +25,26 @@ _travis:
25
25
TEST_LLDB_BINARY=` which lldb-3.6` npm test
26
26
27
27
clean :
28
- rm -rf out
29
- rm -rf build
30
- rm -rf options.gypi
31
- rm -rf lldb
32
- rm -rf addon.node llnode.so
28
+ $( RM ) -r out
29
+ $( RM ) -r build
30
+ $( RM ) options.gypi
31
+ $( RM ) lldb
32
+ $( RM ) llnode.so llnode.dylib
33
33
34
- addon :
34
+ configure : scripts/configure.js
35
35
node scripts/configure.js
36
+
37
+ addon : configure
36
38
node-gyp rebuild
37
39
38
- plugin :
39
- node ./scripts/configure.js
40
+ plugin : configure
40
41
./gyp_llnode
41
42
$(MAKE ) -C out/
42
43
43
- .PHONY : all addon clean plugin format
44
+ # configure is run during preinstall
45
+ npm-build :
46
+ ./gyp_llnode
47
+ $(MAKE ) -C out/
48
+ node-gyp rebuild
49
+
50
+ .PHONY : all addon clean plugin format npm-build
Original file line number Diff line number Diff line change 36
36
"xcode_settings" : {
37
37
"OTHER_LDFLAGS" : [
38
38
"-F<(mac_shared_frameworks)" ,
39
- "-Wl,-rpath,<(mac_shared_frameworks)" ,
40
- "-framework LLDB" ,
39
+ "-Wl,-rpath,<(mac_shared_frameworks)" ,
40
+ "-framework LLDB" ,
41
41
],
42
42
},
43
43
},
Original file line number Diff line number Diff line change 12
12
"//" : " (Blame C++)" ,
13
13
"scripts" : {
14
14
"preinstall" : " node scripts/configure.js" ,
15
- "install" : " ./gyp_llnode && ( gmake -C out/ || make -C out/ )" ,
15
+ "install" : " ( gmake npm-build || make npm-build )" ,
16
16
"postinstall" : " node scripts/cleanup.js" ,
17
17
"test" : " tape test/*-test.js"
18
18
},
Original file line number Diff line number Diff line change @@ -342,8 +342,8 @@ function getLinuxLib(version) {
342
342
const libDir = child_process . execFileSync ( 'llvm-config-' + version ,
343
343
[ '--libdir' ] ) . toString ( ) . trim ( ) ;
344
344
const soPath = path . join ( libDir , `liblldb-${ version } .so` ) ;
345
- const stat = fs . lstatSync ( soPath ) ;
346
- if ( stat . isFile ( ) || stat . isSymbolicLink ( ) ) {
345
+ const stat = fs . statSync ( soPath ) ;
346
+ if ( stat . isFile ( ) ) {
347
347
return {
348
348
buildDir : path . dirname ( libDir ) ,
349
349
lib : `lldb-${ version } `
@@ -353,7 +353,7 @@ function getLinuxLib(version) {
353
353
console . log ( err ) ;
354
354
// Return undefined, we will download the headers.
355
355
}
356
- // On Redhat lib are just installed in /usr/lib
356
+ // On Redhat libs are just installed in /usr/lib
357
357
if ( fs . existsSync ( '/usr/lib/lldblldb.so' ) ) {
358
358
return {
359
359
buildDir : '/usr' ,
You can’t perform that action at this time.
0 commit comments