Skip to content

fix osx compile - add -Wno-comment to CFLAGS - disable linux test #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
k-okada wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix osx compile - add -Wno-comment to CFLAGS - disable linux test #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad3e45a
disable linux test
k-okada Jul 12, 2018
7c7eee6
add -Wno-comment to CFLAGS
k-okada Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
# Travis Continuous Integration Configuration File
matrix:
include:
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=ubuntu:trusty
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=ubuntu:xenial
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=osrf/ubuntu_armhf:trusty
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=osrf/ubuntu_armhf:xenial
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=osrf/ubuntu_arm64:trusty
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=osrf/ubuntu_arm64:xenial
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=debian:jessie
- os: linux
dist: trusty
sudo: required
cache: apt
env: DOCKER_IMAGE=osrf/debian_arm64:jessie
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=ubuntu:trusty
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=ubuntu:xenial
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=osrf/ubuntu_armhf:trusty
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=osrf/ubuntu_armhf:xenial
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=osrf/ubuntu_arm64:trusty
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=osrf/ubuntu_arm64:xenial
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=debian:jessie
# - os: linux
# dist: trusty
# sudo: required
# cache: apt
# env: DOCKER_IMAGE=osrf/debian_arm64:jessie
- os: osx
env:
global:
Expand Down
2 changes: 1 addition & 1 deletion lisp/Makefile.Darwin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DEBUG= -g
# If you use libc.so.5, remove -DLIB6 option.
# In order to include thread library, libc.so.6 is preferrable.

CFLAGS=-D$(MACHINE) -Wno-return-type -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
CFLAGS=-Wno-comment -D$(MACHINE) -Wno-return-type -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
-DLIB6 $(ALIGN_FUNCTIONS) \
$(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
-DGCC $(GCC3) \
Expand Down