Skip to content

Commit 8e1da10

Browse files
committed
Add minor improvements in Makefile
1 parent bbd7fef commit 8e1da10

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ matrix:
3333
env: AUTOTOOLS=yes COVERAGE=yes BUILD=static
3434
- os: osx
3535
compiler: gcc
36+
- os: osx
37+
env: AUTOTOOLS=no COVERAGE=yes BUILD=static
3638

3739
script: ./script/ci-build-libsass
3840
before_install: ./script/ci-install-deps

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@ RM ?= rm -f
44
CP ?= cp -a
55
MKDIR ?= mkdir
66
WINDRES ?= windres
7-
CFLAGS ?= -Wall -O2
8-
CXXFLAGS ?= -Wall -O2
9-
LDFLAGS ?= -Wall -O2 -Wl,--no-undefined
7+
CFLAGS ?= -Wall
8+
CXXFLAGS ?= -Wall
9+
LDFLAGS ?= -Wall
10+
ifneq "$(COVERAGE)" "yes"
11+
CFLAGS += -O2
12+
CXXFLAGS += -O2
13+
LDFLAGS += -O2
14+
endif
15+
LDFLAGS += -Wl,-undefined,error
1016
CAT ?= $(if $(filter $(OS),Windows_NT),type,cat)
1117

1218
ifneq (,$(findstring /cygdrive/,$(PATH)))

script/ci-build-libsass

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ if [ "x$SASS_SPEC_PATH" == "x" ]; then export SASS_SPEC_PATH=$(pwd)/sass-spec; f
1414

1515
if [ "x$COVERAGE" == "xyes" ]; then
1616
COVERAGE_OPT="--enable-coverage"
17-
export EXTRA_CFLAGS="-O0 --coverage"
18-
export EXTRA_CXXFLAGS="-O0 --coverage"
19-
export EXTRA_LDFLAGS="-O0 --coverage"
17+
export EXTRA_CFLAGS="--coverage"
18+
export EXTRA_CXXFLAGS="--coverage"
19+
export EXTRA_LDFLAGS="--coverage"
2020
else
2121
COVERAGE_OPT="--disable-coverage"
2222
fi

0 commit comments

Comments
 (0)