File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -111,7 +111,7 @@ install:
111
111
exit 1;
112
112
fi
113
113
114
- - $NOMC || MYCXXFLAGS ="-I${MYINCLUDE} ${CXXFLAGS}"
114
+ - $NOMC || MYCOMPILEFLAGS ="-I${MYINCLUDE} ${CXXFLAGS} ${CPPFLAGS }"
115
115
- $NOMC || MYLINKFLAGS="-L${MYLIB} ${LDFLAGS} -Wl,-rpath,${MYLIB}"
116
116
117
117
@@ -120,7 +120,7 @@ before_script:
120
120
121
121
122
122
script :
123
- - $CXX -o testlib $MYCXXFLAGS testlib.cpp -lObjCryst $MYLINKFLAGS
123
+ - $CXX -o testlib $MYCOMPILEFLAGS testlib.cpp -lObjCryst $MYLINKFLAGS
124
124
- ./testlib
125
125
126
126
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ Import('env')
5
5
# Build environment configuration --------------------------------------------
6
6
7
7
# Apply CFLAGS, CXXFLAGS, LDFLAGS from the system environment.
8
- flagnames = 'CFLAGS CXXFLAGS LDFLAGS' .split ()
8
+ flagnames = 'CFLAGS CXXFLAGS CPPFLAGS LDFLAGS' .split ()
9
9
env .MergeFlags ([os .environ .get (n , '' ) for n in flagnames ])
10
10
11
11
# Insert LIBRARY_PATH explicitly because some compilers
You can’t perform that action at this time.
0 commit comments