From 8eeb144f3224429557a989fef0f7fb2d83dda569 Mon Sep 17 00:00:00 2001
From: tangxifan <tangxifan@gmail.com>
Date: Wed, 10 Apr 2019 15:22:20 +0800
Subject: [PATCH] Streamline Makefile and Travis for Mac OS

---
 .travis.yml                  |  7 +++++--
 Makefile                     |  1 +
 abc_with_bb_support/Makefile | 13 +++++++------
 vpr7_x2p/vpr/Makefile        |  2 ++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5bab08505..2cfbf7975 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ matrix:
           - qt5-default
     - os: osx
       osx_image: xcode10.2 # we target latest MacOS Mojave
-      compiler: clang++ # Use clang instead of gcc in MacOS
+      compiler: gcc-4.9 # Use clang instead of gcc in MacOS
       addons:
         homebrew:
           packages:
@@ -71,10 +71,13 @@ matrix:
           - qt5
 
 before_install:
+  - source .travis/common.sh
 
 install:
+  - ./travis/install.sh
 
-script: make
+script:
+  - ./travis/script.sh
 
 after_failure:
   - echo "success"
diff --git a/Makefile b/Makefile
index 80f9076b8..e6d831477 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ packages:
 	@ cd vpr && make packages
 
 clean:
+	@ cd abc_with_bb_support && make clean
 	@ cd ace2 && make clean
 	@ cd vpr7_x2p && make clean
 	@ cd yosys && make clean
diff --git a/abc_with_bb_support/Makefile b/abc_with_bb_support/Makefile
index 2bc193930..62ea63398 100644
--- a/abc_with_bb_support/Makefile
+++ b/abc_with_bb_support/Makefile
@@ -2,7 +2,7 @@
 CC   := gcc-4.9
 CXX  := g++-4.9
 LD   := g++-4.9
-CP   := cp
+CP   := cpp-4.9
 
 PROG := abc
 
@@ -31,7 +31,7 @@ CC_VERSION := $(shell echo $(CC) | sed 's/gcc-//g')
 #GCC_VERSION := $(GCC_MAJOR).$(GCC_MINOR)
 
 #ifeq ($(filter $(GCC_VERSION) $(CC_VERSION),4.9),)
-ifeq ($(CC_VERSION),4.9)
+#ifeq ($(CC_VERSION),4.9)
   
 default: $(PROG)
 
@@ -43,7 +43,8 @@ CFLAGS   += -MD -MP
 CXXFLAGS += $(CFLAGS) 
 
 #LIBS := -ldl -rdynamic -ltermcap
-LIBS := -ldl -rdynamic
+#LIBS := -ldl -rdynamic
+LIBS := -ldl
 
 SRC  := 
 GARBAGE := core core.* *.stackdump ./tags $(PROG)
@@ -88,9 +89,9 @@ lib$(PROG).a: $(OBJ)
 
 docs:
 	doxygen doxygen.conf
-else
+#else
 
-$(error gcc-4.9 is necessary to compile abc)
+#$(error gcc-4.9 is necessary to compile abc)
 
-endif
+#endif
 
diff --git a/vpr7_x2p/vpr/Makefile b/vpr7_x2p/vpr/Makefile
index 119f38490..837b9e7f0 100755
--- a/vpr7_x2p/vpr/Makefile
+++ b/vpr7_x2p/vpr/Makefile
@@ -41,6 +41,8 @@ UNAME := $(shell uname)
 # determine build env
 ifeq ($(UNAME), Darwin)
 	MAC_OS = true
+    # Disable graphic in MacOS
+    ENABLE_GRAPHICS = false 
 else
 	MAC_OS = false
 endif