diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-08-20 11:57:52 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-08-20 11:57:52 -0700 |
| commit | d9fe4cccbf3cc03fa57b177fd13c6e900a2134f7 (patch) | |
| tree | aceb37b755f6b112e754bbdd50f0a4a6a6ee111d /.travis | |
| parent | 297a9802122817e143b1e4b87fd0d4e357606a72 (diff) | |
| parent | 3f4886e7a3ff14578b9c6d614efd360478e5886e (diff) | |
| download | yosys-d9fe4cccbf3cc03fa57b177fd13c6e900a2134f7.tar.gz yosys-d9fe4cccbf3cc03fa57b177fd13c6e900a2134f7.tar.bz2 yosys-d9fe4cccbf3cc03fa57b177fd13c6e900a2134f7.zip | |
Merge remote-tracking branch 'origin/master' into eddie/synth_xilinx
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/build-and-test.sh | 2 | ||||
| -rwxr-xr-x | .travis/setup.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis/build-and-test.sh b/.travis/build-and-test.sh index b8c35041d..801407d1e 100755 --- a/.travis/build-and-test.sh +++ b/.travis/build-and-test.sh @@ -28,7 +28,7 @@ echo echo 'Building...' && echo -en 'travis_fold:start:script.build\\r' echo -make +make CC=$CC CXX=$CC LD=$CC echo echo -en 'travis_fold:end:script.build\\r' diff --git a/.travis/setup.sh b/.travis/setup.sh index 4af0b8ee9..02879b974 100755 --- a/.travis/setup.sh +++ b/.travis/setup.sh @@ -51,7 +51,7 @@ fi git clone git://github.com/steveicarus/iverilog.git cd iverilog autoconf - ./configure --prefix=$HOME/.local-bin + CC=gcc CXX=g++ ./configure --prefix=$HOME/.local-bin make make install echo |