Synchronise with v3.12-rc1

[kconfig-frontends] / utils / merge

diff --git a/utils/merge b/utils/merge
index 05274fccb88e2cfed658cdabfec42a481f876f59..81b0c61bb9e2060c18fb9dd315e8a9e0ae8a195a 100755 (executable)
--- a/utils/merge
+++ b/utils/merge
@@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then
        exit
 fi
 
+# If we have an output dir, setup the O= argument, otherwise leave
+# it blank, since O=. will create an unnecessary ./source softlink
+OUTPUT_ARG=""
+if [ "$OUTPUT" != "." ] ; then
+       OUTPUT_ARG="O=$OUTPUT"
+fi
+
+
 # Use the merged file as the starting point for:
 # alldefconfig: Fills in any missing symbols with Kconfig default
 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET
+make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)