summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-03-23 15:53:06 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-05-17 00:25:02 -0400
commitfb579e15c56994bc6c4cc266535024f20a81f830 (patch)
treecceee15e84d67bdbbe6eced0a4e89449a416bcc4 /mk
parent8dfea0789957278b99bf302dfb24078fff84b6d2 (diff)
downloadhaskell-fb579e15c56994bc6c4cc266535024f20a81f830.tar.gz
driver: Introduce pgmcxx
Here we introduce proper support for compilation of C++ objects. This includes: * logic in `configure` to detect the C++ toolchain and propagating this information into the `settings` file * logic in the driver to use the C++ toolchain when compiling C++ sources
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 10ba35b79b..fdbaab58b9 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -358,7 +358,7 @@ BIN_DIST_TAR_COMP = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.$(TAR_COMP_EXT)
# SRC_HC_OPTS is *not* for adding flags that are required to make your
# build work. Examples:
#
-# - instead of using -pgmc/-pgma-/-pgml, use the --with-gcc option to configure
+# - instead of using -pgmc/-pgmcxx/-pgma-/-pgml, use the --with-gcc option to configure
#
# - if you need -optc, -opta, or -optl flags, the CONF_CC_* and CONF_LD_*
# variables are more appropriate (set via configure)
@@ -457,6 +457,7 @@ TargetHasLibm = @TargetHasLibm@
TablesNextToCode = @TablesNextToCode@
SettingsCCompilerCommand = @SettingsCCompilerCommand@
+SettingsCxxCompilerCommand = @SettingsCxxCompilerCommand@
SettingsHaskellCPPCommand = @SettingsHaskellCPPCommand@
SettingsHaskellCPPFlags = @SettingsHaskellCPPFlags@
SettingsCCompilerFlags = @SettingsCCompilerFlags@