aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.def3
-rw-r--r--Makefile.in14
3 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fe60c7..6dd71f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-24 Bernd Edlinger <bernd.edlinger@hotmail.de>
+
+ * Makefile.def (module=gmp): Work around in-tree gmp configure bug with
+ missing flex.
+ * Makefile.in: Regenerated.
+
2014-11-21 Ilya Verbin <ilya.verbin@intel.com>
* Makefile.in: Regenerate.
diff --git a/Makefile.def b/Makefile.def
index 40bbca9..ddcbf5b 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -48,7 +48,8 @@ host_modules= { module= gas; bootstrap=true; };
host_modules= { module= gcc; bootstrap=true;
extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
- extra_configure_flags='--disable-shared';
+ // Work around in-tree gmp configure bug with missing flex.
+ extra_configure_flags='--disable-shared LEX="touch lex.yy.c"';
no_install= true;
// none-*-* disables asm optimizations, bootstrap-testing
// the compiler more thoroughly.
diff --git a/Makefile.in b/Makefile.in
index 0bae570..02d914c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10986,7 +10986,7 @@ configure-gmp:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
- --target=none-${host_vendor}-${host_os} --disable-shared \
+ --target=none-${host_vendor}-${host_os} --disable-shared LEX="touch lex.yy.c" \
|| exit 1
@endif gmp
@@ -11022,7 +11022,7 @@ configure-stage1-gmp:
--target=none-${host_vendor}-${host_os} \
\
$(STAGE1_CONFIGURE_FLAGS) \
- --disable-shared
+ --disable-shared LEX="touch lex.yy.c"
@endif gmp-bootstrap
.PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
@@ -11056,7 +11056,7 @@ configure-stage2-gmp:
--target=none-${host_vendor}-${host_os} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE2_CONFIGURE_FLAGS) \
- --disable-shared
+ --disable-shared LEX="touch lex.yy.c"
@endif gmp-bootstrap
.PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
@@ -11090,7 +11090,7 @@ configure-stage3-gmp:
--target=none-${host_vendor}-${host_os} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE3_CONFIGURE_FLAGS) \
- --disable-shared
+ --disable-shared LEX="touch lex.yy.c"
@endif gmp-bootstrap
.PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
@@ -11124,7 +11124,7 @@ configure-stage4-gmp:
--target=none-${host_vendor}-${host_os} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE4_CONFIGURE_FLAGS) \
- --disable-shared
+ --disable-shared LEX="touch lex.yy.c"
@endif gmp-bootstrap
.PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
@@ -11158,7 +11158,7 @@ configure-stageprofile-gmp:
--target=none-${host_vendor}-${host_os} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEprofile_CONFIGURE_FLAGS) \
- --disable-shared
+ --disable-shared LEX="touch lex.yy.c"
@endif gmp-bootstrap
.PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
@@ -11192,7 +11192,7 @@ configure-stagefeedback-gmp:
--target=none-${host_vendor}-${host_os} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEfeedback_CONFIGURE_FLAGS) \
- --disable-shared
+ --disable-shared LEX="touch lex.yy.c"
@endif gmp-bootstrap