diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
| commit | e31e53467bb18e83a01b60881adf35fa8a54531d (patch) | |
| tree | 83272e7c4afeca0b4c1cf009678a12d1751e09f0 /mk | |
| parent | c228dba74d4b4536721f9537ad67ac70fd57afe0 (diff) | |
| parent | 6ac888a1e388ebd5e92f957b2c77f326ab197765 (diff) | |
fix merge conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 854fdb19d..3e5d92e6f 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -266,7 +266,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU +export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD CXX_FOR_BUILD QEMU endif all: menuconfig diff --git a/mk/vars.mk b/mk/vars.mk index 925635d01..893416ab2 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -140,6 +140,7 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ CROSS='$(TARGET_CROSS)' HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ + CXX_FOR_BUILD='${CXX_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \ |