Use bootstrap bcond instead of global

This has a nice side effect of automatically adding ~bootstrap suffix to
the dist tag.
epel9
Kalev Lember 3 years ago
parent 2aec1641c0
commit b52f0d6dbc

@ -11,7 +11,7 @@
# older, working LDC compiler in the buildroot, which is then used to build a # older, working LDC compiler in the buildroot, which is then used to build a
# new intermediate LDC version, and finally this in turn is used to build the # new intermediate LDC version, and finally this in turn is used to build the
# final compiler that gets installed in the rpm. # final compiler that gets installed in the rpm.
%global bootstrap_stage2 0 %bcond_with bootstrap
%undefine _hardened_build %undefine _hardened_build
@ -128,7 +128,7 @@ mkdir geany_config
%global optflags %{optflags} -fno-strict-aliasing %global optflags %{optflags} -fno-strict-aliasing
%if 0%{?bootstrap_stage2} %if %{with bootstrap}
tar xf %{SOURCE0} tar xf %{SOURCE0}
mkdir build-bootstrap mkdir build-bootstrap
pushd build-bootstrap pushd build-bootstrap
@ -142,7 +142,7 @@ popd
-DINCLUDE_INSTALL_DIR:PATH=%{_prefix}/lib/ldc/%{_target_platform}/include/d \ -DINCLUDE_INSTALL_DIR:PATH=%{_prefix}/lib/ldc/%{_target_platform}/include/d \
-DBASH_COMPLETION_COMPLETIONSDIR:PATH=%{_datadir}/bash-completion/completions \ -DBASH_COMPLETION_COMPLETIONSDIR:PATH=%{_datadir}/bash-completion/completions \
-DLLVM_CONFIG:PATH=llvm-config%{?llvm_version:-%{llvm_version}} \ -DLLVM_CONFIG:PATH=llvm-config%{?llvm_version:-%{llvm_version}} \
%if 0%{?bootstrap_stage2} %if %{with bootstrap}
-DD_COMPILER:PATH=`pwd`/build-bootstrap/bin/ldmd2 \ -DD_COMPILER:PATH=`pwd`/build-bootstrap/bin/ldmd2 \
%endif %endif
%{nil} %{nil}

Loading…
Cancel
Save