X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=4fad21a8368db8a26c045b355618657c54c9e64f;hb=0774773de51df37d7af0d6ac920d304790a610c6;hp=868486fb2f37cf4dbc51ea91ecb9488e8a203595;hpb=01c7d4c51c7dc3e15f2feedfffc05a8cb85cb5a3;p=lwext4.git

diff --git a/cscript b/cscript
index 868486f..4fad21a 100644
--- a/cscript
+++ b/cscript
@@ -45,21 +45,23 @@ def make_toolchain(filename, arch, sdk_prefix, sdk):
 def build(target, options):
     if target.platform == 'linux':
         type = 'generic'
+        build_suffix = type
         blockdev = 'linux'
         ext = 'a'
         device = 'dev'
-        target.command('CFLAGS=-fPIC cmake .')
     elif target.platform == 'osx':
         if target.arch == 'x86_64':
             type = 'osx'
         elif target.arch == 'arm64':
             type = 'osx-arm64'
+        build_suffix = 'osx'
         make_toolchain('toolchain/%s.cmake' % type, target.arch, target.sdk_prefix, target.sdk)
         blockdev = 'linux'
         ext = 'dylib'
         device = 'dev'
     elif target.platform == 'windows':
         type = 'mingw' if target.bits == 64 else 'mingw-32'
+        build_suffix = type
         blockdev = 'windows'
         ext = 'dll'
         device = 'windows'
@@ -67,9 +69,9 @@ def build(target, options):
     target.command('mkdir -p %s/include/lwext4' % target.directory)
     target.command('cp -r include/* %s/include/lwext4' % target.directory)
     target.command('make %s' % type)
-    target.command('make -j%d -C build_%s' % (target.parallel, type))
-    target.command('cp -r build_%s/include/generated %s/include/lwext4' % (type, target.directory))
+    target.command('make -j%d -C build_%s' % (target.parallel, build_suffix))
+    target.command('cp -r build_%s/include/generated %s/include/lwext4' % (build_suffix, target.directory))
     target.command('cp blockdev/%s/file_%s.h %s/include/lwext4' % (blockdev, device, target.directory))
     target.command('mkdir -p %s/lib' % target.directory)
-    target.command('cp build_%s/src/liblwext4.%s %s/lib' % (type, ext, target.directory))
-    target.command('cp build_%s/blockdev/libblockdev.%s %s/lib' % (type, ext, target.directory))
+    target.command('cp build_%s/src/liblwext4.%s %s/lib' % (build_suffix, ext, target.directory))
+    target.command('cp build_%s/blockdev/libblockdev.%s %s/lib' % (build_suffix, ext, target.directory))