File tree Expand file tree Collapse file tree 5 files changed +21
-9
lines changed Expand file tree Collapse file tree 5 files changed +21
-9
lines changed Original file line number Diff line number Diff line change 8
8
out /
9
9
npm-debug.log
10
10
node_modules /
11
+
11
12
# generated by scripts/configure.js
12
13
options.gypi
13
- .project
14
- addon.node
Original file line number Diff line number Diff line change @@ -39,8 +39,7 @@ plugin: configure
39
39
node scripts/cleanup.js
40
40
41
41
.PHONY : addon
42
- addon :
43
- node scripts/configure.js
42
+ addon : configure
44
43
node-gyp rebuild
45
44
46
45
.PHONY : _travis
@@ -50,6 +49,14 @@ _travis:
50
49
LLNODE_DEBUG=true \
51
50
npm test
52
51
52
+ # `configure` is run during preinstall.
53
+ # This is run by `npm install`.
54
+ .PHONY : npm-build
55
+ npm-build :
56
+ ./gyp_llnode
57
+ $(MAKE ) -C out/
58
+ node-gyp rebuild
59
+
53
60
.PHONY : clean
54
61
clean :
55
62
$(RM ) -r out
Original file line number Diff line number Diff line change 13
13
14
14
"targets" : [{
15
15
"target_name" : "addon" ,
16
+ "type" : "loadable_module" ,
16
17
"sources" : [
17
18
"src/addon.cc" ,
18
19
"src/llnode_module.cc" ,
26
27
"<(lldb_dir)/include" ,
27
28
"<!(node -e \" require('nan')\" )"
28
29
],
30
+ "cflags" : [ "-std=c++11" ],
29
31
"conditions" : [
30
32
[ "OS == 'mac'" , {
33
+ "xcode_settings" : {
34
+ "OTHER_CPLUSPLUSFLAGS" : [ "-std=c++11" , "-stdlib=libc++" ],
35
+ },
31
36
"conditions" : [
32
37
[ "lldb_build_dir == ''" , {
33
38
"variables" : {
36
41
"xcode_settings" : {
37
42
"OTHER_LDFLAGS" : [
38
43
"-F<(mac_shared_frameworks)" ,
39
- "-Wl,-rpath,<(mac_shared_frameworks)" ,
40
- "-framework LLDB" ,
44
+ "-Wl,-rpath,<(mac_shared_frameworks)" ,
45
+ "-framework LLDB" ,
41
46
],
42
47
},
43
48
},
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
},
22
22
},
23
23
"files" : [
24
24
" Makefile" ,
25
+ " binding.gyp" ,
25
26
" llnode.gyp.json" ,
26
27
" gyp_llnode" ,
27
28
" common.gypi" ,
Original file line number Diff line number Diff line change @@ -340,7 +340,7 @@ function getLinuxLib(version) {
340
340
console . log ( 'Checking for shared libraries, version is ' + version ) ;
341
341
try {
342
342
const libDir = child_process . execFileSync ( 'llvm-config-' + version ,
343
- [ '--libdir' ] ) . toString ( ) . trim ( ) ;
343
+ [ '--libdir' ] ) . toString ( ) . trim ( ) ;
344
344
const soPath = path . join ( libDir , `liblldb-${ version } .so` ) ;
345
345
const stat = fs . lstatSync ( soPath ) ;
346
346
if ( stat . isFile ( ) || stat . isSymbolicLink ( ) ) {
@@ -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