Merge remote-tracking branch 'origin/master' into lighthouse-master

2 files changed, 6 insertions, 6 deletions

diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index 29ddea7ce6..f4a7f29b1a 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -11,9 +11,9 @@ TEST=$6
 EXE=`basename "$6"`
 DESCRIPTION=$7
 shift 7
-LFLAGS=""
+LFLAGS="$SYSROOT_FLAG"
 INCLUDEPATH=""
-CXXFLAGS=""
+CXXFLAGS="$SYSROOT_FLAG"
 MAC_ARCH_CXXFLAGS=""
 MAC_ARCH_LFLAGS=""
 while [ "$#" -gt 0 ]; do
diff --git a/config.tests/unix/endian/endiantest.cpp b/config.tests/unix/endian/endiantest.cpp
index 296f8900a1..40b2c3862d 100644
--- a/config.tests/unix/endian/endiantest.cpp
+++ b/config.tests/unix/endian/endiantest.cpp
@@ -48,9 +48,9 @@ short lsb_littleendian[] = { 0x0000, 0x654c, 0x7361, 0x5374, 0x6769, 0x696e, 0x6
 int main(int, char **)
 {
     // make sure the linker doesn't throw away the arrays
-    char *msb_bigendian_string = (char *) msb_bigendian;
-    char *lsb_littleendian_string = (char *) lsb_littleendian;
-    (void) msb_bigendian_string;
-    (void) lsb_littleendian_string;
+    void (*msb_bigendian_string)() = (void (*)())msb_bigendian;
+    void (*lsb_littleendian_string)() = (void (*)())lsb_littleendian;
+    (void)msb_bigendian_string();
+    (void)lsb_littleendian_string();
     return msb_bigendian[1] == lsb_littleendian[1];
 }