diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:17 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:20 +0200 |
| commit | 42f2da5e6b543e698fc4f036c45ebb15078409c8 (patch) | |
| tree | 2d688b1a812d8410d4ae85283d5e413957000e11 /src/v8/v8base.pri | |
| parent | e9962cc300a805ce09a02ce0c9ae23ceaf8073bb (diff) | |
| parent | 009f3d14045e2e2a6eff8c87a8da9eaa621c5249 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/src.pro
Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
Diffstat (limited to 'src/v8/v8base.pri')
| -rw-r--r-- | src/v8/v8base.pri | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/v8/v8base.pri b/src/v8/v8base.pri new file mode 100644 index 0000000000..f0d7c00451 --- /dev/null +++ b/src/v8/v8base.pri @@ -0,0 +1,19 @@ +V8DIR = $$(V8DIR) +isEmpty(V8DIR) { + V8DIR = $$PWD/../3rdparty/v8 +} else { + message(using external V8 from $$V8DIR) +} + +*-g++*: { + QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter + + # mksnapshot hangs if gcc 4.5 is used + # for reference look at http://code.google.com/p/v8/issues/detail?id=884 + equals(QT_GCC_MAJOR_VERSION, 4): equals(QT_GCC_MINOR_VERSION, 5) { + message(because of a bug in gcc / v8 we need to add -fno-strict-aliasing) + QMAKE_CFLAGS += -fno-strict-aliasing + QMAKE_CXXFLAGS += -fno-strict-aliasing + } +} |