Fix travis

.travis.yml

@@ -4,18 +4,21 @@ language: d
 sudo: false
 
 d:
-  - dmd
-  - dmd-2.072.2
+  - dmd-2.079.1
 
 matrix:
   include:
     - os: linux
       d: dmd
+      env: NATIVE_DMD_IMPORTS=-I/home/travis/dlang/dmd-2.079.1/src/druntime/import -I/home/travis/dlang/dmd-2.079.1/src/phobos
     - os: osx
       d: dmd
+      env: NATIVE_DMD_IMPORTS=-I/Users/travis/dlang/dmd-2.079.1/src/druntime/import -I/Users/travis/dlang/dmd-2.079.1/src/phobos
     - os: linux
       d: dmd
-      env: SEPARATE_LIBD_COMPILATION=1
+      env:
+        - SEPARATE_LIBD_COMPILATION=1
+        - NATIVE_DMD_IMPORTS=-I/home/travis/dlang/dmd-2.079.1/src/druntime/import -I/home/travis/dlang/dmd-2.079.1/src/phobos
 
 cache:
   directories:
@@ -25,15 +28,9 @@ cache:
 env:
   global:
     - LLVM_VERSION=3.9.0
+    - 
 
 addons:
-  # http://docs.travis-ci.com/user/uploading-artifacts/
-  artifacts:
-    paths:
-      - build_sdc.log
-      - build_sdunit.log
-      - build_libsdrt.log
-
   apt:
     sources:
       # See here for name of the travis apt repos:
@@ -71,8 +68,8 @@ before_install:
   - echo $(dmd --version)
 
 script:
-  - make bin/sdc > build_sdc.log 2>&1
-  - make bin/sdunit > build_sdunit.log 2>&1
-  - make lib/libsdrt.a > build_libsdrt.log 2>&1
+  - make bin/sdc
+  - make bin/sdunit
+  - make lib/libsdrt.a
   # Because lit is gone (used to be in llvm-3.9-tools) we can only run testrunner.
-  - make testrunner
+  - make check-sdc

sdlib/sdmd.mak

@@ -5,7 +5,8 @@ LIBSMD_SRC = sdlib/d/rt/eh.d sdlib/d/rt/object.d sdlib/d/rt/dwarf.d
 LIBSDMD = lib/libsdmd.a
 
 SDFLAGS ?=
-LIBSDMD_IMPORTS = -I/usr/include/dmd/druntime/import -I/usr/include/dmd/phobos -Isdlib
+NATIVE_DMD_IMPORTS ?= -I/usr/include/dmd/druntime/import -I/usr/include/dmd/phobos
+LIBSDMD_IMPORTS = $(NATIVE_DMD_IMPORTS) -Isdlib
 
 $(LIBSDMD): $(LIBSMD_SRC)
 	@mkdir -p lib obj