Skip to content

Commit d32bdb2

Browse files
committed
all env vars
1 parent a66abfa commit d32bdb2

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

src/SPC/store/pkg/PkgConfig.php

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,29 @@ public function extract(string $name): void
6767

6868
// build from source into package prefix
6969
$env = [
70-
'CFLAGS' => getenv('SPC_DEFAULT_C_FLAGS') ?: '-Os',
70+
'CFLAGS' => getenv('SPC_DEFAULT_C_FLAGS') ?: '-Os -Wno-int-conversion',
7171
'LDFLAGS' => (SPCTarget::isStatic() ? '--static' : ''),
7272
'PKG_CONFIG' => 'pkg-config',
7373
'PKG_CONFIG_PATH' => BUILD_ROOT_PATH . '/lib/pkgconfig',
7474
];
75-
$shell = shell()->appendEnv($env)->cd($srcdir);
76-
$shell->exec("CC=cc ./configure --prefix='{$prefix}' --with-internal-glib --disable-host-tool --without-sysroot --without-system-include-path --without-system-library-path --without-pc-path");
77-
$shell->exec('CC=cc make -j' . (getenv('SPC_CONCURRENCY') ?: '1'));
78-
$shell->exec('CC=cc make install-exec');
75+
$shell = shell()
76+
->setEnv([
77+
'CC' => 'cc',
78+
'CXX' => 'c++',
79+
'AR' => 'ar',
80+
'LD' => 'ld',
81+
])
82+
->appendEnv($env)->cd($srcdir);
83+
$shell->exec(
84+
'--with-internal-glib '.
85+
'--disable-host-tool '.
86+
'--without-sysroot '.
87+
'--without-system-include-path '.
88+
'--without-system-library-path '.
89+
'--without-pc-path',
90+
);
91+
$shell->exec('make -j' . (getenv('SPC_CONCURRENCY') ?: '1'));
92+
$shell->exec('make install-exec');
7993
if (is_file($bin)) {
8094
@shell()->exec('strip ' . $bin);
8195
}

0 commit comments

Comments
 (0)