GitLab

75ce1385

by Sven Tennie at 2026-03-25T14:44:01+01:00

Respect user set CFLAGS, CXXFLAGS and LDFLAGS

These were ignored on installs.

34f32edd

by Sven Tennie at 2026-03-25T14:44:01+01:00

Only add flags if they are new

This prevents duplicated when the user already set the arguments in
CXXFLAGS or CFLAGS.

@@ -159,6 +159,13 @@ AC_PROG_CXX([c++ g++ clang++])
  MOVE_TO_FLAGS([CC],[CFLAGS])
  MOVE_TO_FLAGS([CXX],[CXXFLAGS])
 +dnl Initialize CONF_* variables with user-provided environment variables
 +dnl so that subsequent configure checks modify them and both autoconf and
 +dnl ghc-toolchain see the same values
 +CONF_CC_OPTS_STAGE2="$CFLAGS"
 +CONF_CXX_OPTS_STAGE2="$CXXFLAGS"
 +CONF_GCC_LINKER_OPTS_STAGE2="$LDFLAGS"
++
  dnl ** figure out how to invoke the C preprocessor (i.e. `gcc -E`)
  AC_PROG_CPP
@@ -424,6 +431,16 @@ checkMake380() {
  checkMake380 make
  checkMake380 gmake
 +# Pass the CONF_* variables (which now include user environment variables,
 +# autoconf defaults, and all configure-computed flags) to ghc-toolchain
 +USER_CONF_CC_OPTS_STAGE2="$CONF_CC_OPTS_STAGE2"
 +USER_CONF_CXX_OPTS_STAGE2="$CONF_CXX_OPTS_STAGE2"
 +USER_CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2"
 +USER_CPP_ARGS="$CPPFLAGS"
 +USER_HS_CPP_ARGS="$HaskellCPPArgs"
 +USER_JS_CPP_ARGS="$JavaScriptCPPArgs"
 +USER_CMM_CPP_ARGS="$CmmCPPArgs"
++
  # Toolchain target files
  FIND_GHC_TOOLCHAIN_BIN([YES])
  PREP_TARGET_FILE

@@ -61,7 +61,7 @@ findHsCpp progOpt cc = checking "for Haskell C preprocessor" $ do
    let rawHsCppProgram = addFlagIfNew "-E" foundHsCppProg
    -- Always try to add the Haskell-specific CPP flags, regardless of the user options
    hppArgs <- findHsCppArgs rawHsCppProgram
 -  let hsCppProgram = over _prgFlags (++hppArgs) rawHsCppProgram
 +  let hsCppProgram = foldr addFlagIfNew rawHsCppProgram (reverse hppArgs)
    return HsCpp{hsCppProgram}
  -- | Given a C preprocessor, figure out how it should be invoked to preprocess

@@ -393,7 +393,7 @@ addNoAsNeeded archOs cc ccLink
    | os <- archOS_OS archOs
    , osElfTarget os
    = checking "that --no-as-needed works" $ do
 -      let ccLink' = over _prgFlags (++["-Wl,--no-as-needed"]) ccLink
 +      let ccLink' = addFlagIfNew "-Wl,--no-as-needed" ccLink
        checkLinkWorks cc ccLink'
        return ccLink'
    | otherwise = return ccLink