diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2014-03-20 15:47:18 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2014-03-27 12:36:14 +0000 |
| commit | 6189c7674fc5c735db1a446d0b222369a3767369 (patch) | |
| tree | 2bd674daab6a9778d259fbb5d1af09a4a58237ba /configure.ac | |
| parent | f86825462bf1d14ea6aad1029a5ec9d7a08049df (diff) | |
| download | haskell-6189c7674fc5c735db1a446d0b222369a3767369.tar.gz | |
--with-gcc overrides CC_STAGE0 when not cross-compiling (#8498)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0a4df23605..9f0edaa663 100644 --- a/configure.ac +++ b/configure.ac @@ -474,6 +474,11 @@ FIND_GCC([WhatGccIsCalled], [gcc], [gcc]) CC="$WhatGccIsCalled" export CC +# If --with-gcc was used, and we're not cross-compiling, then it also +# applies to the stage0 compiler. +MAYBE_OVERRIDE_STAGE0([gcc],[CC_STAGE0]) +MAYBE_OVERRIDE_STAGE0([ar],[AR_STAGE0]) + dnl ** Which ld to use? dnl -------------------------------------------------------------- FP_ARG_WITH_PATH_GNU_PROG([LD], [ld], [ld]) @@ -583,8 +588,8 @@ FP_PROG_LD_FILELIST FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[IGNORE_LINKER_LD_FLAGS],[CPPFLAGS]) FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_GCC_LINKER_OPTS_STAGE0],[CONF_LD_LINKER_OPTS_STAGE0],[CONF_CPP_OPTS_STAGE0]) FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_GCC_LINKER_OPTS_STAGE1],[CONF_LD_LINKER_OPTS_STAGE1],[CONF_CPP_OPTS_STAGE1]) -# Stage 3 won't be supported by cross-compilation FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_GCC_LINKER_OPTS_STAGE2],[CONF_LD_LINKER_OPTS_STAGE2],[CONF_CPP_OPTS_STAGE2]) +# Stage 3 won't be supported by cross-compilation FP_GCC_EXTRA_FLAGS |