Fix linker RWX warning
This commit is contained in:
9
Rakefile
9
Rakefile
@@ -350,7 +350,7 @@ rule '.elna.o' => ->(match) {
|
||||
architecture, *path_components = relative_from_tmp(match).to_a
|
||||
path_components[-1] = path_components.last.ext('')
|
||||
|
||||
[File.join(path_components), TMP + architecture]
|
||||
[File.join('source', path_components), TMP + architecture]
|
||||
} do |t|
|
||||
options = BuildTarget.new relative_from_tmp(t.name).first
|
||||
compiler = options.rootfs + "bin/#{options.target}-gcc"
|
||||
@@ -366,10 +366,11 @@ rule 'kernel.elf' => ->(match) {
|
||||
|
||||
arch_objects = FileList["arch/#{instruction_set}/*.s"]
|
||||
.map { |source| Pathname.new(source).relative_path_from("arch/#{instruction_set}").sub_ext('.s.o') }
|
||||
.map { |source| TMP + architecture + source }
|
||||
.map(&:to_path)
|
||||
source_objects = FileList['source/*.elna']
|
||||
.map { |source| Pathname.new(source).relative_path_from('source').sub_ext('.elna.o') }
|
||||
objects = (arch_objects + source_objects).map { |source| (TMP + architecture + source).to_s }
|
||||
|
||||
arch_objects + FileList['*.elna'].map { |source| (TMP + architecture + source).to_path + '.o' } << 'kernel.ld'
|
||||
objects << "arch/#{instruction_set}/kernel.ld"
|
||||
} do |t|
|
||||
options = BuildTarget.new relative_from_tmp(t.name).first
|
||||
compiler = options.rootfs + "bin/#{options.target}-gcc"
|
||||
|
Reference in New Issue
Block a user