do not prepend build_root to source files that are already inside build_root
This commit is contained in:
1 parent
8976d7dea2
commit
1868193b54
2 files changed
+32
-2
No files matched your search
@@ -13,7 +13,10 @@ module Rscons
|
||||
attr_accessor :echo
|
||||
|
||||
# String or +nil+
|
||||
attr_accessor :build_root
|
||||
attr_reader :build_root
|
||||
def build_root=(build_root)
|
||||
@build_root = build_root.gsub('\\', '/')
|
||||
end
|
||||
|
||||
# Create an Environment object.
|
||||
# @param options [Hash]
|
||||
@@ -106,7 +109,7 @@ module Rscons
|
||||
end
|
||||
end
|
||||
if @build_root and not found_match
|
||||
unless source_fname.absolute_path?
|
||||
unless source_fname.absolute_path? or build_fname.start_with?("#{@build_root}/")
|
||||
build_fname = "#{@build_root}/#{build_fname}"
|
||||
end
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user