Skip to content

Commit 11fd190

Browse files
author
Dane Springmeyer
committed
only apply gcc-preinclude.h for binaries on travis
1 parent a18ca2e commit 11fd190

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,10 @@ before_script:
132132
fi
133133

134134
script:
135+
- export CXXFLAGS="${CXXFLAGS:-} -include $(pwd)/src/gcc-preinclude.h"
135136
- if [[ "${NODE_VERSION}" ]]; then ./scripts/build_against_node.sh; fi;
136-
- nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" || true
137-
- nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" || true
137+
- nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" | c++filt || true
138+
- nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true
138139
- if [[ "${NODE_VERSION}" -eq "4" ]]; then ./node_modules/.bin/eslint lib; fi;
139140
# disabled for now: need to port to sudo:false
140141
#- if [[ "${NODE_WEBKIT}" ]]; then ./scripts/build_against_node_webkit.sh; fi;

binding.gyp

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
}
3232
]
3333
],
34-
"cflags": [ "-include ../src/gcc-preinclude.h" ],
3534
"sources": [
3635
"src/database.cc",
3736
"src/node_sqlite3.cc",

deps/sqlite3.gyp

+1-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
'dependencies': [
7272
'action_before_build'
7373
],
74-
'cflags': [ '-include ../src/gcc-preinclude.h' ],
7574
'sources': [
7675
'<(SHARED_INTERMEDIATE_DIR)/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
7776
],
@@ -87,8 +86,7 @@
8786
],
8887
},
8988
'cflags_cc': [
90-
'-Wno-unused-value',
91-
'-include ../src/gcc-preinclude.h'
89+
'-Wno-unused-value'
9290
],
9391
'defines': [
9492
'_REENTRANT=1',

0 commit comments

Comments
 (0)