diff --git a/.travis/script.sh b/.travis/script.sh index f0469d798..a89f5a3ed 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -7,10 +7,10 @@ $SPACER start_section "OpenFPGA.build" "${GREEN}Building..${NC}" if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - make -j1 + make else # For linux, we enable full package compilation - make -j8 + make fi end_section "OpenFPGA.build" diff --git a/abc_with_bb_support/Makefile b/abc_with_bb_support/Makefile index 62ea63398..a96ee7512 100644 --- a/abc_with_bb_support/Makefile +++ b/abc_with_bb_support/Makefile @@ -43,8 +43,18 @@ CFLAGS += -MD -MP CXXFLAGS += $(CFLAGS) #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 := GARBAGE := core core.* *.stackdump ./tags $(PROG)