2011-07-26 14:41:37 +00:00
|
|
|
diff -up tbb30_20110419oss/build/linux.gcc.inc\~ tbb30_20110419oss/build/linux.gcc.inc
|
|
|
|
|
--- tbb30_20110419oss/build/linux.gcc.inc~ 2011-04-19 13:48:58.000000000 +0200
|
|
|
|
|
+++ tbb30_20110419oss/build/linux.gcc.inc 2011-07-26 14:02:48.482006056 +0200
|
2013-05-22 13:32:02 +00:00
|
|
|
@@ -59,10 +59,10 @@ ifneq (,$(shell gcc -dumpversion | egrep
|
|
|
|
|
endif
|
2011-07-26 14:41:37 +00:00
|
|
|
|
|
|
|
|
ifeq ($(cfg), release)
|
2012-06-07 19:51:18 +00:00
|
|
|
- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
|
2013-05-22 13:32:02 +00:00
|
|
|
+ CPLUS_FLAGS = $(CXXFLAGS) $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
|
2011-07-26 14:41:37 +00:00
|
|
|
endif
|
|
|
|
|
ifeq ($(cfg), debug)
|
|
|
|
|
- CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
|
|
|
|
|
+ CPLUS_FLAGS = $(CXXFLAGS) -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
|
|
|
|
|
endif
|
|
|
|
|
|
2012-06-07 19:51:18 +00:00
|
|
|
ifneq (00,$(lambdas)$(cpp0x))
|
2011-07-26 14:41:37 +00:00
|
|
|
|
2013-05-22 13:32:02 +00:00
|
|
|
Diff finished. Tue Feb 26 13:00:13 2013
|
