Skip to content

Commit 2e28070

Browse files
committed
pass along CPPFLAGS during TBB compilation
1 parent 5c9505f commit 2e28070

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/Makevars.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ else
3535

3636
MAKE += -e -s
3737
MAKE_CMD = \
38-
CONLY="@CC@" \
39-
CPLUS="@CXX11@" \
38+
CONLY="@CC@ @CPPFLAGS@" \
39+
CPLUS="@CXX11@ @CPPFLAGS@" \
4040
CXXFLAGS="@CXX11FLAGS@ -DTBB_NO_LEGACY=1" \
4141
PIC_KEY="@CXX11PICFLAGS@" \
4242
WARNING_SUPPRESS="" \

tools/config/configure.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ switch(
2828

2929
CXX11 = define(
3030
CC = "$(CC)",
31+
CPPFLAGS = "$(CPPFLAGS)",
3132
CXX11 = "$(CXX11)",
3233
CXX11FLAGS = cxxflags,
3334
CXX11STD = "$(CXX11STD)",
@@ -36,6 +37,7 @@ switch(
3637

3738
CXX1X = define(
3839
CC = "$(CC)",
40+
CPPFLAGS = "$(CPPFLAGS)",
3941
CXX11 = "$(CXX1X)",
4042
CXX11FLAGS = cxxflags,
4143
CXX11STD = "$(CXX1XSTD)",
@@ -44,6 +46,7 @@ switch(
4446

4547
CXX = define(
4648
CC = "$(CC)",
49+
CPPFLAGS = "$(CPPFLAGS)",
4750
CXX11 = "$(CXX)",
4851
CXX11FLAGS = cxxflags,
4952
CXX11STD = "-std=c++0x",

0 commit comments

Comments
 (0)