sm: pi build

martinies · Mar 26, 2015 · 89ea779 · 89ea779
1 parent fc1023f
commit 89ea779
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/deps/mozjs/mozjs.gyp b/deps/mozjs/mozjs.gyp
@@ -224,7 +224,6 @@
       ],
 
       'defines': [
-        'HAVE_VA_LIST_AS_ARRAY=1',
         'DISABLE_SHARED_JS=1',
         'STATIC_JS_API=1',
         'JS_DEFAULT_JITREPORT_GRANULARITY=3',   # JITREPORT_GRANULARITY_OP
@@ -277,6 +276,8 @@
                 ]
               }]
             ]
+        }, {
+          'defines': ['HAVE_VA_LIST_AS_ARRAY=1']
         }],
         ['target_arch=="x64"', {
           'defines':[ 'JS_PUNBOX64', 'JS_CPU_X64=1' ],

diff --git a/deps/mozjs/src/jsprf.cpp b/deps/mozjs/src/jsprf.cpp
@@ -27,17 +27,17 @@ using namespace js;
  * Note: on some platforms va_list is defined as an array,
  * and requires array notation.
  */
-#if (defined(XP_MACOSX) || defined(__ANDROID__)) && defined(JS_CPU_ARM)
-#define VARARGS_ASSIGN(foo, bar)        (foo) = (bar)
-#else
+//#if defined(JS_CPU_ARM)
+//#define VARARGS_ASSIGN(foo, bar)        (foo) = (bar)
+//#else
 #ifdef HAVE_VA_COPY
 #define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo, bar)
 #elif defined(HAVE_VA_LIST_AS_ARRAY)
 #define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
 #else
 #define VARARGS_ASSIGN(foo, bar)        (foo) = (bar)
 #endif
-#endif
+//#endif
 
 struct SprintfState
 {

diff --git a/jx.gyp b/jx.gyp
@@ -245,7 +245,7 @@
           }],
           ['OS in "linux android freebsd"', {
             "cflags": [
-              "-std=c++11", '-D__STDC_LIMIT_MACROS',
+              "-std=c++0x", '-D__STDC_LIMIT_MACROS',
               '-Wno-missing-field-initializers', '-Wno-extra',
               '-Wno-invalid-offsetof', '-Wno-ignored-qualifiers'
             ],