Streamline Makefile and Travis for Mac OS
This commit is contained in:
parent
b330fb4bb7
commit
8eeb144f32
|
@ -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"
|
||||
|
|
1
Makefile
1
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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue