summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeokYeon Hwang <syeon.hwang@samsung.com>2017-05-15 13:58:33 +0900
committerSeokYeon Hwang <syeon.hwang@samsung.com>2017-05-15 16:45:28 +0900
commit5e77dd92824db7e1e8d9c631ac40905549d5814c (patch)
treebc0213063361e48565dcf770b60e379e359fc122
parent436f4d4289865e6461df3342eacbeef2c6f78e78 (diff)
downloadqemu-5e77dd92824db7e1e8d9c631ac40905549d5814c.tar.gz
qemu-5e77dd92824db7e1e8d9c631ac40905549d5814c.tar.bz2
qemu-5e77dd92824db7e1e8d9c631ac40905549d5814c.zip
configure: modify configure for recent macOS
Change-Id: I8fb928f2de4f7168b27faedac02a0d2c37585666 Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
-rwxr-xr-xconfigure15
-rwxr-xr-xtizen/emulator_configure.sh6
2 files changed, 13 insertions, 8 deletions
diff --git a/configure b/configure
index ef57ee9b3e..46b5f4c459 100755
--- a/configure
+++ b/configure
@@ -60,6 +60,7 @@ do_compiler() {
shift
echo $compiler "$@" >> config.log
$compiler "$@" >> config.log 2>&1 || return $?
+
# Test passed. If this is an --enable-werror build, rerun
# the test with -Werror and bail out if it fails. This
# makes warning-generating-errors in configure test code
@@ -74,11 +75,15 @@ do_compiler() {
;;
esac
echo $compiler -Werror "$@" >> config.log
- $compiler -Werror "$@" >> config.log 2>&1 && return $?
- error_exit "configure test passed without -Werror but failed with -Werror." \
- "This is probably a bug in the configure script. The failing command" \
- "will be at the bottom of config.log." \
- "You can run configure with --disable-werror to bypass this check."
+# Modified - it produces confusable result with clang.
+# We use -Werror for all platforms. So, simply, we just return result.
+ $compiler -Werror "$@" >> config.log 2>&1
+ return $?
+# $compiler -Werror "$@" >> config.log 2>&1 && return $?
+# error_exit "configure test passed without -Werror but failed with -Werror." \
+# "This is probably a bug in the configure script. The failing command" \
+# "will be at the bottom of config.log." \
+# "You can run configure with --disable-werror to bypass this check."
}
do_cc() {
diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index bb9e2d86cc..e7eaa9b48d 100755
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -193,10 +193,10 @@ CONFIGURE_APPEND="
Darwin*)
CONFIGURE_APPEND="
--cc=clang
- --cxx=clang
- --extra-cflags=-mmacosx-version-min=10.7
+ --cxx=clang++
+ --extra-cflags=-mmacosx-version-min=10.9
--extra-cflags=-Wno-error=deprecated-declarations
- --extra-ldflags=-lstdc++
+ --extra-cflags=-Wno-error=address-of-packed-member
--extra-ldflags=-Wl,-rpath,'@executable_path'
--audio-drv-list=coreaudio
--enable-cocoa