소스 검색

Use system layout on Linux by default

[SVN r54770]
Vladimir Prus 17 년 전
부모
커밋
ad9144577f
1개의 변경된 파일15개의 추가작업 그리고 1개의 파일을 삭제
  1. 15 1
      Jamroot

+ 15 - 1
Jamroot

@@ -277,7 +277,21 @@ rule libraries-to-install ( existing-libraries * )
 
 # What kind of layout are we doing?
 layout = [ MATCH "^--layout=(.*)" : [ modules.peek : ARGV ] ] ;
-layout ?= versioned ;
+# On Windows, we used versioned layout by default in order to
+# be compatible with autolink. On other systems, we use system
+# layout which is what every other program uses. Note that windows
+# check is static, and won't 
+if ! $(layout)
+{
+    if [ modules.peek : NT ]
+    {
+        layout = versioned ;
+    }
+    else
+    {
+        layout = system ;
+    }
+}
 layout-$(layout) = true ;
 
 

粤ICP备19079148号