diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-04 14:24:48 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-04 14:24:48 +0100 |
| commit | d61b82a6920ff6c499bafb3579733b18177f2fa0 (patch) | |
| tree | 721c30ea82363c90cb0c378c4ed0aa6ad9890e84 /mk | |
| parent | 6640e958d8ae1176ff84c6d33365557257035e9c (diff) | |
| parent | d447483f8e4300fb954faf26675e8984231facdd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/package.mk b/mk/package.mk index 6565bad18..d572e67b0 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -15,6 +15,7 @@ endif endif CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \ + PATH='${TARGET_PATH}' \ CONFIG_SHELL='$(strip ${SHELL})' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \ @@ -42,6 +43,7 @@ ALL_TARGET?= all INSTALL_TARGET?= install MAKE_ENV+= GCC_HONOUR_COPTS=2 \ + PATH='${TARGET_PATH}' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ diff --git a/mk/vars.mk b/mk/vars.mk index e50710f7d..909e75d11 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -81,9 +81,9 @@ TARGET_LDFLAGS+= -flto endif ifneq ($(ADK_DEBUG),) -TARGET_CPPFLAGS+= -DNDEBUG TARGET_CFLAGS+= -g3 -fno-omit-frame-pointer else +TARGET_CPPFLAGS+= -DNDEBUG TARGET_CFLAGS+= -fomit-frame-pointer $(TARGET_OPTIMIZATION) endif @@ -97,7 +97,7 @@ CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) # host compiler flags CPPFLAGS_FOR_BUILD?= -CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) +CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) CXXFLAGS_FOR_BUILD?= -O2 -Wall LDFLAGS_FOR_BUILD?= FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} @@ -111,7 +111,6 @@ KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ LDFLAGS="" CFLAGS_MODULE="-fhonour-copts" V=1 - TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ AR='$(TARGET_CROSS)ar' \ AS='$(TARGET_CROSS)as' \ |