diff options
| author |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2019-07-01 11:34:05 -0400 |
|---|---|---|
| committer | Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2019-07-01 11:34:05 -0400 |
| commit | 7ea3f5a819318988c73989cbbde253e7b5c69e34 (patch) | |
| tree | 486d71c97ea0cf81e429c647798639f7ecf0ed99 | |
| parent | catalyst 3.0.5 (diff) | |
| download | catalyst-7ea3f5a8.tar.gz catalyst-7ea3f5a8.tar.bz2 catalyst-7ea3f5a8.zip | |
maybe fix overrides for flags
it seems cflags and cxxflags overrides work for me while common_flags,
fcflags, and fflags overrides do not. This was the only difference I
could find. I left breadcrumbs on my thought process.
| -rw-r--r-- | catalyst/targets/stage1.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index cc4366b6..59d6d49b 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -38,11 +38,17 @@ class stage1(StageBase): "/usr/share/zoneinfo", self.settings["port_conf"] + "/package*"]) # XXX: How do these override_foo() functions differ from the ones in StageBase and why aren't they in stage3_target? + # XXY: It appears the difference is that these functions are actually doing something and the ones in stagebase don't :-( + # XXZ: I have a wierd suspicion that it's the difference in capitolization def override_chost(self): if "chost" in self.settings: self.settings["CHOST"] = self.settings["chost"] + def override_common_flags(self): + if "common_flags" in self.settings: + self.settings["COMMON_FLAGS"] = self.settings["common_flags"] + def override_cflags(self): if "cflags" in self.settings: self.settings["CFLAGS"] = self.settings["cflags"] @@ -51,6 +57,14 @@ class stage1(StageBase): if "cxxflags" in self.settings: self.settings["CXXFLAGS"] = self.settings["cxxflags"] + def override_fcflags(self): + if "fcflags" in self.settings: + self.settings["FCFLAGS"] = self.settings["fcflags"] + + def override_fflags(self): + if "fflags" in self.settings: + self.settings["FFLAGS"] = self.settings["fflags"] + def override_ldflags(self): if "ldflags" in self.settings: self.settings["LDFLAGS"] = self.settings["ldflags"] |