aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2016-10-20 15:26:38 -0500
committerRob Landley <rob@landley.net>2016-10-20 15:26:38 -0500
commit3214c87ccf7f4a3426fe0d30296af1af85fc864e (patch)
tree06f41c9a8de7331335d39f97faac067e9b039632
parent354ff6831412eb88c64e9f497a382d926dc7b9bd (diff)
downloadtoybox-3214c87ccf7f4a3426fe0d30296af1af85fc864e.tar.gz
Always regenerate config.h for now, so make single and make don't clash.
The problem is that .config and .singleconfig produce the same header file, so checking that the header is newer than the .config file won't help if it was last generated from the other file.
-rwxr-xr-xscripts/make.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/make.sh b/scripts/make.sh
index 50415e55..7ae13c22 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -119,7 +119,8 @@ fi
LINK="$(echo $LDOPTIMIZE $LDFLAGS -o "$UNSTRIPPED" -Wl,--as-needed $(cat generated/optlibs.dat))"
genbuildsh > generated/build.sh && chmod +x generated/build.sh || exit 1
-if isnewer generated/config.h "$KCONFIG_CONFIG"
+#TODO: "make sed && make" doesn't regenerate config.h because diff .config
+if true #isnewer generated/config.h "$KCONFIG_CONFIG"
then
echo "Make generated/config.h from $KCONFIG_CONFIG."