keep bug fixing in Makefiles and remove parallism in Make

lnis-uofu · Apr 10, 2019 · e2e4a92 · e2e4a92
1 parent 7c42119
commit e2e4a92
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git 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
@@ -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)