From 78db7b19e6374aa22d40d8d4eb6541f3c5bdb720 Mon Sep 17 00:00:00 2001
From: Greg Williams <greg.williams@atomicobject.com>
Date: Tue, 29 Jul 2014 15:09:17 -0400
Subject: [PATCH 1/4] Added export to specify LIBRARY_PATH for Linux, due to
 googling

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 6531e7a..7d9246f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,5 @@ rvm:
 install:
   - bundle install
 script:
+  - export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
   - bundle exec rake ci

From ff2156650105daa1db91be4c53e24fcb0d138e1f Mon Sep 17 00:00:00 2001
From: Greg Williams <greg.williams@atomicobject.com>
Date: Tue, 29 Jul 2014 12:28:21 -0700
Subject: [PATCH 2/4] Updated to autodetect 32 or 64 bit and use proper gcc

---
 rakefile.rb => Rakefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename rakefile.rb => Rakefile (84%)

diff --git a/rakefile.rb b/Rakefile
similarity index 84%
rename from rakefile.rb
rename to Rakefile
index bdb4931..8364ef5 100644
--- a/rakefile.rb
+++ b/Rakefile
@@ -24,8 +24,13 @@ task :prepare_for_tests => TEMP_DIRS
 
 include RakefileHelpers
 
-# Load default configuration, for now
-DEFAULT_CONFIG_FILE = 'gcc_32.yml'
+# Load proper GCC as defult configuration
+if 1.size == 8 # 8 bytes => 64-bits
+  DEFAULT_CONFIG_FILE = 'gcc_64.yml'
+else # Assume 32-bit otherwise
+  DEFAULT_CONFIG_FILE = 'gcc_32.yml'
+end
+
 configure_toolchain(DEFAULT_CONFIG_FILE)
 
 desc "Test unity with its own unit tests"

From 849e8eb0f52e65b71549f316ab8e8aa237ebca15 Mon Sep 17 00:00:00 2001
From: Greg Williams <greg.williams@atomicobject.com>
Date: Tue, 29 Jul 2014 15:34:45 -0400
Subject: [PATCH 3/4] Removed Gemfile and Gemfile lock, since no longer
 requires test-unit, and we will assume the user has some version of Rake if
 they want to run the tests.

---
 Gemfile      |  4 ----
 Gemfile.lock | 12 ------------
 2 files changed, 16 deletions(-)
 delete mode 100644 Gemfile
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index 14d3b03..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source "http://rubygems.org/"
-
-gem "rake"
-gem "test-unit", "2.4.3"
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index fab1350..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    rake (10.3.2)
-    test-unit (2.4.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  test-unit (= 2.4.3)

From 9d103ba7125c352057b886014e3b52bce429dbcc Mon Sep 17 00:00:00 2001
From: Greg Williams <greg.williams@atomicobject.com>
Date: Tue, 29 Jul 2014 15:45:07 -0400
Subject: [PATCH 4/4] Removed bundler support from .travis.yml and env setup,
 since unnecessary

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7d9246f..c934f82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,5 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-install:
-  - bundle install
 script:
-  - export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
-  - bundle exec rake ci
+  - rake ci