keep bug fixing in Makefiles and remove parallism in Make
This commit is contained in:
parent
7c42119481
commit
e2e4a9287d
|
@ -7,10 +7,10 @@ $SPACER
|
||||||
|
|
||||||
start_section "OpenFPGA.build" "${GREEN}Building..${NC}"
|
start_section "OpenFPGA.build" "${GREEN}Building..${NC}"
|
||||||
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
|
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
|
||||||
make -j1
|
make
|
||||||
else
|
else
|
||||||
# For linux, we enable full package compilation
|
# For linux, we enable full package compilation
|
||||||
make -j8
|
make
|
||||||
fi
|
fi
|
||||||
end_section "OpenFPGA.build"
|
end_section "OpenFPGA.build"
|
||||||
|
|
||||||
|
|
|
@ -43,8 +43,18 @@ CFLAGS += -MD -MP
|
||||||
CXXFLAGS += $(CFLAGS)
|
CXXFLAGS += $(CFLAGS)
|
||||||
|
|
||||||
#LIBS := -ldl -rdynamic -ltermcap
|
#LIBS := -ldl -rdynamic -ltermcap
|
||||||
#LIBS := -ldl -rdynamic
|
|
||||||
LIBS := -ldl
|
# Depend on Operating Systems, we use different libs in linking
|
||||||
|
UNAME := $(shell uname)
|
||||||
|
# determine build env
|
||||||
|
ifeq ($(UNAME), Darwin)
|
||||||
|
MAC_OS = true
|
||||||
|
LIBS := -ldl
|
||||||
|
else
|
||||||
|
MAC_OS = false
|
||||||
|
LIBS := -ldl -rdynamic
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
SRC :=
|
SRC :=
|
||||||
GARBAGE := core core.* *.stackdump ./tags $(PROG)
|
GARBAGE := core core.* *.stackdump ./tags $(PROG)
|
||||||
|
|
Loading…
Reference in New Issue