:art: change my priorities

diff --git a/.travis.yml b/.travis.yml
index bbb520a805291db6e497f8e253d7cdc329d08c3d..216d7dc4a31060453788c351682de3430088d057 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,8 @@ env:
 
 matrix:
   allow_failures:
-   - compiler: clang
+#   - compiler: clang
+   - os: windows
 
 compiler:
   - gcc

diff --git a/Makefile b/Makefile
index c5e9f86f624ba3e8ed385d5d07f029a3cc62d7a5..783de3e8d00e0ad31625f622311cb2f95e50f736 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,11 +66,11 @@ LDCFG="${LDFLAGS}"
 CFLAGS += -DGWION_BUILTIN
 
 GWLIBS = libgwion.a ast/libgwion_ast.a util/libgwion_util.a
-LDFLAGS += ${GWLIBS}
+_LDFLAGS = ${GWLIBS} ${LDFLAGS}
 
 all: options util/libgwion_util.a ast/libgwion_ast.a libgwion.a src/main.o
        $(info link ${PRG})
-       @${CC} src/main.o -o ${PRG} ${LDFLAGS} ${LIBS}
+       @${CC} src/main.o -o ${PRG} ${_LDFLAGS} ${LIBS}
 
 libgwion.a: ${gwlib_obj}
        ${AR} ${AR_OPT}