From 9ffa8e5585bb7469034149c28f8d4f639f58f1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 5 Nov 2010 15:50:00 +0100 Subject: mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior Reviewed-by: ossi --- mkspecs/common/g++.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf index 0ca4fbd..c5a34a9 100644 --- a/mkspecs/common/g++.conf +++ b/mkspecs/common/g++.conf @@ -7,5 +7,6 @@ warning($$escape_expand("Your mkspec is including 'common/g++.conf', but the mkspecs have been refactored\\n\\tTo fix this include 'common/gcc-base-$${TARGET_PLATFORM}.conf and 'common/g++-$${TARGET_PLATFORM}.conf' instead")) -# We include g++-unix.conf to keep the behavior of the old g++.conf -include(g++-unix.conf) \ No newline at end of file +# We include gcc-base-unix.conf and g++-unix.conf to keep the behavior of the old g++.conf +include(gcc-base-unix.conf) +include(g++-unix.conf) -- cgit v0.12