From 684070063d26cc30ac270f85394536f918e12f42 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Tue, 14 May 2019 00:32:07 -0400 Subject: build: Dynamically generate native OPK_PACKAGES Also don't export it. --- (limited to 'build') diff --git a/build b/build index 71987a0..60d4b84 100755 --- a/build +++ b/build @@ -206,19 +206,11 @@ $(installnative_targets): oh-fixperms -d "$(destdir)" oh-strip -d "$(destdir)" OPK_PACKAGES="\ + $$(printf '%s\n' $${OPK_PACKAGES} | \ + grep -Ev '(gcc|g++)-$(base_version)-.*-.*-.*) gcc-$(base_version)-$(target) \ - cpp-$(base_version) \ g++-$(base_version)-$(target) \ - libgcc.1 \ - libssp.0 \ - libgomp.1 \ - libitm.1 \ - libstdc++.6 \ - libstdc++.6-$(base_version)-dev \ - gcc-$(base_version)-locales \ - "; \ - export OPK_PACKAGES; \ - oh-installfiles -d "$(destdir)" + " oh-installfiles -d "$(destdir)" $(installcross_targets): oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install-gcc -- \ @@ -243,8 +235,6 @@ $(installcross_targets): OPK_PACKAGES="\ gcc-$(base_version)-$(target) \ g++-$(base_version)-$(target) \ - "; \ - export OPK_PACKAGES; \ - oh-installfiles -d "$(destdir)" + " oh-installfiles -d "$(destdir)" install: $(install_targets) -- cgit v0.9.1