diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-02-29 18:23:24 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-04-04 16:20:04 -0700 |
| commit | 65acf35dcfa3784de7e522926469083068599550 (patch) | |
| tree | aff3e7b1bb20d61bc29015de09d3e8e2f2e0ea06 /scripts | |
| parent | 001d24dc338cd11ecfc5d5d1a37436b05be8c5f7 (diff) | |
| download | qtlocation-mapboxgl-65acf35dcfa3784de7e522926469083068599550.tar.gz | |
[core] fix various compilation issues
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/main.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/main.mk b/scripts/main.mk index 889222719e..d10fa39d52 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -147,20 +147,20 @@ Xcode/%: Xcode/__project__ Ninja/%: Ninja/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" - $(QUIET)$(ENV) deps/ninja/ninja-$(HOST) -C build/$(HOST_SLUG)/$(BUILDTYPE) $* + $(QUIET)$(ENV) deps/ninja/ninja-$(BUILD) -C build/$(HOST_SLUG)/$(BUILDTYPE) $* Ninja/compdb: OUTPUT=build/$(HOST_SLUG)/$(BUILDTYPE)/compile_commands.json Ninja/compdb: Ninja/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Writing to $(OUTPUT)$(FORMAT_END)\n" - $(QUIET)$(ENV) deps/ninja/ninja-$(HOST) -C build/$(HOST_SLUG)/$(BUILDTYPE) \ + $(QUIET)$(ENV) deps/ninja/ninja-$(BUILD) -C build/$(HOST_SLUG)/$(BUILDTYPE) \ -t compdb cc cc_s cxx objc objcxx > $(OUTPUT) #### Tidy ###################################################################### tidy: Ninja/compdb @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Generating header files...$(FORMAT_END)\n" - $(QUIET)$(ENV) deps/ninja/ninja-$(HOST) -C build/$(HOST_SLUG)/$(BUILDTYPE) version shaders + $(QUIET)$(ENV) deps/ninja/ninja-$(BUILD) -C build/$(HOST_SLUG)/$(BUILDTYPE) version shaders @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Running tidy...$(FORMAT_END)\n" @./scripts/clang-tidy.sh |