sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support BUILDVARS from cmd line in configure.llvm

Browse source 
Change-Id: I59527c60cb34c12fd2bed449b37bb812a83c4e42
This commit is contained in:
Lionel Sambuc 2015-01-28 15:04:27 +01:00 committed by David van Moolenbroek
parent 035cdb2e79
commit 3ceafe99fd
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
minix/llvm/configure.llvm
View file

@ -105,15 +105,18 @@ fi
######################## ########################
# Build Minix # Build Minix
######################## ########################
export BUILDVARS=$(echo "${BUILDVARS} -V MKBITCODE=yes"| sed -e 's,-V MKMAGIC=yes,-V DBG=-g -V STRIPFLAG=-s -V CPPFLAGS=-D_MINIX_MAGIC=1,')
if [ "${REBUILD_MINIX}" == "yes" ]; then if [ "${REBUILD_MINIX}" == "yes" ]; then
echo "Building Minix..." echo "Building Minix..."
echo "CC:$CC" echo "CC:$CC"
echo "CXX:$CXX" echo "CXX:$CXX"
echo "JOBS:$JOBS" echo "JOBS:$JOBS"
echo "BUILDVARS:$BUILDVARS"
echo echo
cd ${MINIX_ROOT} cd ${MINIX_ROOT}
BUILDVARS="-V MKBITCODE=yes" ./releasetools/x86_hdimage.sh || EXITCODE=1 ./releasetools/x86_hdimage.sh || EXITCODE=1
cd ${MYPWD} cd ${MYPWD}
if [ "$EXITCODE" != "0" ]; then if [ "$EXITCODE" != "0" ]; then
echo "Error: Failed building Minix source code." echo "Error: Failed building Minix source code."

4
share/mk/sys.mk
View file

@ -61,7 +61,11 @@ DBG?= -O1 -fgcse -fstrength-reduce -fgcse-after-reload
.else .else
DBG?= -O2 DBG?= -O2
.endif .endif
.if !defined(__MINIX)
CFLAGS?= ${DBG} CFLAGS?= ${DBG}
.else
CFLAGS+= ${DBG}
.endif # !defined(__MINIX)
LDFLAGS?= LDFLAGS?=
COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}