diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /mk/build.mk | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'mk/build.mk')
| -rw-r--r-- | mk/build.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 53f0ff5bf..5cd9a1458 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -236,7 +236,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH +export BASH HOSTCC HOSTCFLAGS HOSTCXX HOSTCXXFLAGS MAKE LANGUAGE LC_ALL OStype PATH endif all: menuconfig |