Amalgamate on non-autotools CI

glebm · glebm · commit a7be68a40987 · 2019-08-27T02:03:41.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -50,7 +50,7 @@ install:
 build_script:
   - ps: |
       if ($env:Compiler -eq "mingw") {
-        mingw32-make -j4 sassc
+        mingw32-make -j4 sassc AMALGAM=1
       } else {
         msbuild /m:4 /p:"Configuration=$env:Config;Platform=$env:Platform" sassc\win\sassc.sln
       }
diff --git a/script/ci-build-libsass b/script/ci-build-libsass
@@ -87,6 +87,8 @@ if [ "x$AUTOTOOLS" == "xyes" ]; then
 
 else
 
+  MAKE_OPTS="$MAKE_OPTS AMALGAM=1"
+
   make $MAKE_OPTS clean
 
   # Run C++ unit tests

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ install:`
`50`	`50`	`build_script:`
`51`	`51`	`- ps: \|`
`52`	`52`	`if ($env:Compiler -eq "mingw") {`
`53`		`- mingw32-make -j4 sassc`
	`53`	`+ mingw32-make -j4 sassc AMALGAM=1`
`54`	`54`	`} else {`
`55`	`55`	`msbuild /m:4 /p:"Configuration=$env:Config;Platform=$env:Platform" sassc\win\sassc.sln`
`56`	`56`	`}`