mtbuild 0.1.7 → 0.1.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGES.md +7 -0
- data/lib/mtbuild.rb +1 -1
- data/lib/mtbuild/toolchain.rb +2 -0
- data/lib/mtbuild/toolchains/gcc.rb +7 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 249e0f777513e493cbe2481d9e82b905814e8025
|
|
4
|
+
data.tar.gz: aa7e50474eeaffb07153b40ee277bd73a5d99c9e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 38fa6ceb955cf62beb38462054af11772c314fb7f127ee36b6ab02a73ab1ed700417223d621d740d781e5e6ffc62c391e91b6db218c218c9cedb68aaeeb79dc9
|
|
7
|
+
data.tar.gz: e6c8eb9453a45c11a002da8fd9c8d51cc0becdbfeaf014304018bd7b7eb05d71e7b0949316b68b114737fc2bf349fa35536a276c5aa486fdfba428239f8caf0f
|
data/CHANGES.md
CHANGED
data/lib/mtbuild.rb
CHANGED
data/lib/mtbuild/toolchain.rb
CHANGED
|
@@ -4,6 +4,8 @@ module MTBuild
|
|
|
4
4
|
require 'mtbuild/toolchain'
|
|
5
5
|
require 'mtbuild/utils'
|
|
6
6
|
|
|
7
|
+
require 'pathname'
|
|
8
|
+
|
|
7
9
|
Toolchain.register_toolchain(:gcc, 'MTBuild::ToolchainGcc')
|
|
8
10
|
|
|
9
11
|
# This Toolchain subclass can build using GCC
|
|
@@ -157,7 +159,11 @@ module MTBuild
|
|
|
157
159
|
cflags_s = @cflags.empty? ? '' : " #{@cflags}"
|
|
158
160
|
cxxflags_s = @cxxflags.empty? ? '' : " #{@cxxflags}"
|
|
159
161
|
ldflags_s = @ldflags.empty? ? '' : " #{@ldflags}"
|
|
160
|
-
linker_script_s = @linker_script.empty?
|
|
162
|
+
linker_script_s = if @linker_script.empty? then
|
|
163
|
+
''
|
|
164
|
+
else
|
|
165
|
+
" -Wl,-T\"#{((Pathname.new @linker_script).relative?) ? File.join(@project_folder, @linker_script) : @linker_script}\""
|
|
166
|
+
end
|
|
161
167
|
return "\"#{compiler_cpp}\"#{cppflags_s}#{cxxflags_s}#{ldflags_s}#{include_paths_s}#{library_paths_s}#{linker_script_s}#{prerequisites_s} #{map_flag(map_name)} -o \"#{output_name}\"" if @link_as_cpp
|
|
162
168
|
return "\"#{compiler_c}\"#{cppflags_s}#{cflags_s}#{ldflags_s}#{include_paths_s}#{library_paths_s}#{linker_script_s}#{prerequisites_s} #{map_flag(map_name)} -o \"#{output_name}\""
|
|
163
169
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mtbuild
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jerry Ryle
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-10-
|
|
11
|
+
date: 2015-10-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|